feat: expose merge_commit_template to gitops scheduler

docs/cmd/jx-gitops_annotate.md

@@ -31,12 +31,12 @@ Annotates all kubernetes resources in the given directory tree
       --kind-ignore stringArray   adds Kubernetes resource kinds to exclude. For kind expressions see: https://github.com/jenkins-x/jx-helpers/tree/master/docs/kind_filters.md
       --overwrite                 Set to false to not overwrite any existing value (default true)
   -p, --pod-spec                  annotate the PodSpec in spec.template.metadata.annotations (or spec.jobTemplate.spec.template.metadata.annotations for CronJobs) rather than the top level annotations
-      --selector stringToString   adds Kubernetes label selector to filter on, e.g. --selector app=pusher-wave,heritage=Helm (default [])
+      --selector stringToString   adds Kubernetes label selector to filter on, e.g. --selector app=wave,heritage=Helm (default [])
       --selector-target string    sets which path in the Kubernetes resources to select on instead of metadata.labels.
 ```
 
 ### SEE ALSO
 
 * [jx-gitops](jx-gitops.md)	 - commands for working with GitOps based git repositories
 
-###### Auto generated by spf13/cobra on 7-Oct-2024
+###### Auto generated by spf13/cobra on 29-Apr-2026

docs/cmd/jx-gitops_helmfile_move.md

@@ -42,12 +42,12 @@ The annotation "meta.helm.sh/release-namespace" will be added by default and con
       --kind-ignore stringArray      adds Kubernetes resource kinds to exclude. For kind expressions see: https://github.com/jenkins-x/jx-helpers/tree/master/docs/kind_filters.md
   -o, --output-dir string            the output directory (default "config-root")
       --override-namespace           applies the namespace specified in helmfile to all the generated resources (default true)
-      --selector stringToString      adds Kubernetes label selector to filter on, e.g. --selector app=pusher-wave,heritage=Helm (default [])
+      --selector stringToString      adds Kubernetes label selector to filter on, e.g. --selector app=wave,heritage=Helm (default [])
       --selector-target string       sets which path in the Kubernetes resources to select on instead of metadata.labels.
 ```
 
 ### SEE ALSO
 
 * [jx-gitops helmfile](jx-gitops_helmfile.md)	 - Commands for working with helmfile
 
-###### Auto generated by spf13/cobra on 6-Nov-2024
+###### Auto generated by spf13/cobra on 29-Apr-2026

docs/cmd/jx-gitops_image.md

@@ -29,7 +29,7 @@ Updates images in the kubernetes resources from the version stream
   -k, --kind stringArray            adds Kubernetes resource kinds to filter on. For kind expressions see: https://github.com/jenkins-x/jx-helpers/tree/master/docs/kind_filters.md
       --kind-ignore stringArray     adds Kubernetes resource kinds to exclude. For kind expressions see: https://github.com/jenkins-x/jx-helpers/tree/master/docs/kind_filters.md
       --log-level string            Sets the logging level. If not specified defaults to $JX_LOG_LEVEL
-      --selector stringToString     adds Kubernetes label selector to filter on, e.g. --selector app=pusher-wave,heritage=Helm (default [])
+      --selector stringToString     adds Kubernetes label selector to filter on, e.g. --selector app=wave,heritage=Helm (default [])
       --selector-target string      sets which path in the Kubernetes resources to select on instead of metadata.labels.
   -s, --source-dir string           the directory to recursively look for the *.yaml files to modify (default "content-root")
       --verbose                     Enables verbose output. The environment variable JX_LOG_LEVEL has precedence over this flag and allows setting the logging level to any value of: panic, fatal, error, warn, info, debug, trace
@@ -40,4 +40,4 @@ Updates images in the kubernetes resources from the version stream
 
 * [jx-gitops](jx-gitops.md)	 - commands for working with GitOps based git repositories
 
-###### Auto generated by spf13/cobra on 7-Oct-2024
+###### Auto generated by spf13/cobra on 29-Apr-2026

docs/cmd/jx-gitops_label.md

@@ -31,12 +31,12 @@ Labels all kubernetes resources in the given directory tree
       --kind-ignore stringArray   adds Kubernetes resource kinds to exclude. For kind expressions see: https://github.com/jenkins-x/jx-helpers/tree/master/docs/kind_filters.md
       --overwrite                 Set to false to not overwrite any existing value (default true)
   -p, --pod-spec                  label the PodSpec in spec.template.metadata.labels (or spec.jobTemplate.spec.template.metadata.labels for CronJobs) rather than the top level labels
-      --selector stringToString   adds Kubernetes label selector to filter on, e.g. --selector app=pusher-wave,heritage=Helm (default [])
+      --selector stringToString   adds Kubernetes label selector to filter on, e.g. --selector app=wave,heritage=Helm (default [])
       --selector-target string    sets which path in the Kubernetes resources to select on instead of metadata.labels.
 ```
 
 ### SEE ALSO
 
 * [jx-gitops](jx-gitops.md)	 - commands for working with GitOps based git repositories
 
-###### Auto generated by spf13/cobra on 7-Oct-2024
+###### Auto generated by spf13/cobra on 29-Apr-2026

docs/cmd/jx-gitops_namespace.md

@@ -36,12 +36,12 @@ Updates all kubernetes resources in the given directory to the given namespace
   -k, --kind stringArray          adds Kubernetes resource kinds to filter on. For kind expressions see: https://github.com/jenkins-x/jx-helpers/tree/master/docs/kind_filters.md
       --kind-ignore stringArray   adds Kubernetes resource kinds to exclude. For kind expressions see: https://github.com/jenkins-x/jx-helpers/tree/master/docs/kind_filters.md
   -n, --namespace string          the namespace to modify the resources to
-      --selector stringToString   adds Kubernetes label selector to filter on, e.g. --selector app=pusher-wave,heritage=Helm (default [])
+      --selector stringToString   adds Kubernetes label selector to filter on, e.g. --selector app=wave,heritage=Helm (default [])
       --selector-target string    sets which path in the Kubernetes resources to select on instead of metadata.labels.
 ```
 
 ### SEE ALSO
 
 * [jx-gitops](jx-gitops.md)	 - commands for working with GitOps based git repositories
 
-###### Auto generated by spf13/cobra on 7-Oct-2024
+###### Auto generated by spf13/cobra on 29-Apr-2026

docs/cmd/jx-gitops_repository_add.md

@@ -30,12 +30,12 @@ Add one or more repositories to the SourceConfig
       --kind-ignore stringArray   adds Kubernetes resource kinds to exclude. For kind expressions see: https://github.com/jenkins-x/jx-helpers/tree/master/docs/kind_filters.md
       --namespace string          the namespace to discover SourceRepository resources to default the GitKind. If not specified then use the current namespace
   -s, --scheduler string          the name of the Scheduler to use for the repository
-      --selector stringToString   adds Kubernetes label selector to filter on, e.g. --selector app=pusher-wave,heritage=Helm (default [])
+      --selector stringToString   adds Kubernetes label selector to filter on, e.g. --selector app=wave,heritage=Helm (default [])
       --selector-target string    sets which path in the Kubernetes resources to select on instead of metadata.labels.
 ```
 
 ### SEE ALSO
 
 * [jx-gitops repository](jx-gitops_repository.md)	 - Commands for working with source repositories
 
-###### Auto generated by spf13/cobra on 19-Feb-2025
+###### Auto generated by spf13/cobra on 29-Apr-2026

docs/cmd/jx-gitops_repository_create.md

@@ -21,7 +21,7 @@ Creates any missing SourceRepository resources
       --invert-selector           inverts the effect of selector to exclude resources matched by selector
   -k, --kind stringArray          adds Kubernetes resource kinds to filter on. For kind expressions see: https://github.com/jenkins-x/jx-helpers/tree/master/docs/kind_filters.md
       --kind-ignore stringArray   adds Kubernetes resource kinds to exclude. For kind expressions see: https://github.com/jenkins-x/jx-helpers/tree/master/docs/kind_filters.md
-      --selector stringToString   adds Kubernetes label selector to filter on, e.g. --selector app=pusher-wave,heritage=Helm (default [])
+      --selector stringToString   adds Kubernetes label selector to filter on, e.g. --selector app=wave,heritage=Helm (default [])
       --selector-target string    sets which path in the Kubernetes resources to select on instead of metadata.labels.
   -s, --source-dir string         the directory to look for and generate the SourceConfig files
 ```
@@ -30,4 +30,4 @@ Creates any missing SourceRepository resources
 
 * [jx-gitops repository](jx-gitops_repository.md)	 - Commands for working with source repositories
 
-###### Auto generated by spf13/cobra on 19-Feb-2025
+###### Auto generated by spf13/cobra on 29-Apr-2026

docs/cmd/jx-gitops_repository_export.md

@@ -28,12 +28,12 @@ jx-gitops repository export
   -k, --kind stringArray          adds Kubernetes resource kinds to filter on. For kind expressions see: https://github.com/jenkins-x/jx-helpers/tree/master/docs/kind_filters.md
       --kind-ignore stringArray   adds Kubernetes resource kinds to exclude. For kind expressions see: https://github.com/jenkins-x/jx-helpers/tree/master/docs/kind_filters.md
   -n, --namespace string          the namespace to look for SourceRepository, SourceRepositoryGroup and Scheduler resources
-      --selector stringToString   adds Kubernetes label selector to filter on, e.g. --selector app=pusher-wave,heritage=Helm (default [])
+      --selector stringToString   adds Kubernetes label selector to filter on, e.g. --selector app=wave,heritage=Helm (default [])
       --selector-target string    sets which path in the Kubernetes resources to select on instead of metadata.labels.
 ```
 
 ### SEE ALSO
 
 * [jx-gitops repository](jx-gitops_repository.md)	 - Commands for working with source repositories
 
-###### Auto generated by spf13/cobra on 19-Feb-2025
+###### Auto generated by spf13/cobra on 29-Apr-2026

docs/cmd/jx-gitops_repository_resolve.md

@@ -27,7 +27,7 @@ Resolves the git repository URL for the cluster/environment
       --invert-selector           inverts the effect of selector to exclude resources matched by selector
   -k, --kind stringArray          adds Kubernetes resource kinds to filter on. For kind expressions see: https://github.com/jenkins-x/jx-helpers/tree/master/docs/kind_filters.md
       --kind-ignore stringArray   adds Kubernetes resource kinds to exclude. For kind expressions see: https://github.com/jenkins-x/jx-helpers/tree/master/docs/kind_filters.md
-      --selector stringToString   adds Kubernetes label selector to filter on, e.g. --selector app=pusher-wave,heritage=Helm (default [])
+      --selector stringToString   adds Kubernetes label selector to filter on, e.g. --selector app=wave,heritage=Helm (default [])
       --selector-target string    sets which path in the Kubernetes resources to select on instead of metadata.labels.
   -s, --source-dir string         the directory to recursively look for the *.yaml or *.yml source Environment/SourceRepository files (default ".")
 ```
@@ -36,4 +36,4 @@ Resolves the git repository URL for the cluster/environment
 
 * [jx-gitops repository](jx-gitops_repository.md)	 - Commands for working with source repositories
 
-###### Auto generated by spf13/cobra on 7-Oct-2024
+###### Auto generated by spf13/cobra on 29-Apr-2026

docs/cmd/jx-gitops_requirement_edit.md

@@ -36,7 +36,6 @@ Edits the local 'jx-requirements.yml file
       --git-name string              the name of the git repository
       --git-server string            the git server host such as https://github.com or https://gitlab.com
   -h, --help                         help for edit
-      --kaniko-sa string             configures the Kaniko service account name
       --project string               configures the Google Project ID
   -p, --provider string              configures the kubernetes provider
   -r, --region string                configures the cloud region
@@ -58,4 +57,4 @@ Edits the local 'jx-requirements.yml file
 
 * [jx-gitops requirement](jx-gitops_requirement.md)	 - Commands for working with jx-requirements.yml
 
-###### Auto generated by spf13/cobra on 5-Oct-2022
+###### Auto generated by spf13/cobra on 29-Apr-2026

docs/cmd/jx-gitops_sa_secret.md

@@ -26,12 +26,12 @@ Adds one or more secrets to the given ServiceAccount files
   -k, --kind stringArray          adds Kubernetes resource kinds to filter on. For kind expressions see: https://github.com/jenkins-x/jx-helpers/tree/master/docs/kind_filters.md
       --kind-ignore stringArray   adds Kubernetes resource kinds to exclude. For kind expressions see: https://github.com/jenkins-x/jx-helpers/tree/master/docs/kind_filters.md
   -s, --secret stringArray        the Secret names to add to the ServiceAccount
-      --selector stringToString   adds Kubernetes label selector to filter on, e.g. --selector app=pusher-wave,heritage=Helm (default [])
+      --selector stringToString   adds Kubernetes label selector to filter on, e.g. --selector app=wave,heritage=Helm (default [])
       --selector-target string    sets which path in the Kubernetes resources to select on instead of metadata.labels.
 ```
 
 ### SEE ALSO
 
 * [jx-gitops sa](jx-gitops_sa.md)	 - Commands for working with kubernetes ServiceAccount resources
 
-###### Auto generated by spf13/cobra on 19-Feb-2025
+###### Auto generated by spf13/cobra on 29-Apr-2026

docs/cmd/jx-gitops_upgrade.md

@@ -30,6 +30,7 @@ Upgrades the GitOps git repository with the latest configuration and versions th
       --log-level string            Sets the logging level. If not specified defaults to $JX_LOG_LEVEL
       --namespace string            the default namespace if none is specified in the helmfile.yaml (default "jx")
   -o, --owner string                filter on the Kptfile repository owner (user/organisation) for which packages to update
+      --release-notes-file string   the file to save any release notes in. By default any release notes will be rendered in the console
   -r, --repo string                 filter on the Kptfile repository name  for which packages to update
   -s, --strategy string             the 'kpt' strategy to use. To see available strategies type 'kpt pkg update --help'. Typical values are: resource-merge, fast-forward, force-delete-replace (default "resource-merge")
   -u, --url string                  filter on the Kptfile repository URL for which packages to update
@@ -42,4 +43,4 @@ Upgrades the GitOps git repository with the latest configuration and versions th
 
 * [jx-gitops](jx-gitops.md)	 - commands for working with GitOps based git repositories
 
-###### Auto generated by spf13/cobra on 22-Jan-2024
+###### Auto generated by spf13/cobra on 29-Apr-2026

docs/config.md

@@ -1747,5 +1747,5 @@ string
 <hr/>
 <p><em>
 Generated with <code>gen-crd-api-reference-docs</code>
-on git commit <code>060775df</code>.
+on git commit <code>1e7e7641</code>.
 </em></p>

docs/man/man1/jx-gitops-annotate.1

@@ -51,7 +51,7 @@ Annotates all kubernetes resources in the given directory tree
 
 .PP
 \fB\-\-selector\fP=[]
-    adds Kubernetes label selector to filter on, e.g. \-\-selector app=pusher\-wave,heritage=Helm
+    adds Kubernetes label selector to filter on, e.g. \-\-selector app=wave,heritage=Helm
 
 .PP
 \fB\-\-selector\-target\fP=""

docs/man/man1/jx-gitops-helmfile-move.1

@@ -78,7 +78,7 @@ The annotation "meta.helm.sh/release\-namespace" will be added by default and co
 
 .PP
 \fB\-\-selector\fP=[]
-    adds Kubernetes label selector to filter on, e.g. \-\-selector app=pusher\-wave,heritage=Helm
+    adds Kubernetes label selector to filter on, e.g. \-\-selector app=wave,heritage=Helm
 
 .PP
 \fB\-\-selector\-target\fP=""

docs/man/man1/jx-gitops-image.1

@@ -51,7 +51,7 @@ Updates images in the kubernetes resources from the version stream
 
 .PP
 \fB\-\-selector\fP=[]
-    adds Kubernetes label selector to filter on, e.g. \-\-selector app=pusher\-wave,heritage=Helm
+    adds Kubernetes label selector to filter on, e.g. \-\-selector app=wave,heritage=Helm
 
 .PP
 \fB\-\-selector\-target\fP=""

docs/man/man1/jx-gitops-label.1

@@ -51,7 +51,7 @@ Labels all kubernetes resources in the given directory tree
 
 .PP
 \fB\-\-selector\fP=[]
-    adds Kubernetes label selector to filter on, e.g. \-\-selector app=pusher\-wave,heritage=Helm
+    adds Kubernetes label selector to filter on, e.g. \-\-selector app=wave,heritage=Helm
 
 .PP
 \fB\-\-selector\-target\fP=""

docs/man/man1/jx-gitops-namespace.1

@@ -55,7 +55,7 @@ Updates all kubernetes resources in the given directory to the given namespace
 
 .PP
 \fB\-\-selector\fP=[]
-    adds Kubernetes label selector to filter on, e.g. \-\-selector app=pusher\-wave,heritage=Helm
+    adds Kubernetes label selector to filter on, e.g. \-\-selector app=wave,heritage=Helm
 
 .PP
 \fB\-\-selector\-target\fP=""

docs/man/man1/jx-gitops-repository-add.1

@@ -63,7 +63,7 @@ Add one or more repositories to the SourceConfig
 
 .PP
 \fB\-\-selector\fP=[]
-    adds Kubernetes label selector to filter on, e.g. \-\-selector app=pusher\-wave,heritage=Helm
+    adds Kubernetes label selector to filter on, e.g. \-\-selector app=wave,heritage=Helm
 
 .PP
 \fB\-\-selector\-target\fP=""

docs/man/man1/jx-gitops-repository-create.1

@@ -47,7 +47,7 @@ Creates any missing SourceRepository resources
 
 .PP
 \fB\-\-selector\fP=[]
-    adds Kubernetes label selector to filter on, e.g. \-\-selector app=pusher\-wave,heritage=Helm
+    adds Kubernetes label selector to filter on, e.g. \-\-selector app=wave,heritage=Helm
 
 .PP
 \fB\-\-selector\-target\fP=""

docs/man/man1/jx-gitops-repository-export.1

@@ -55,7 +55,7 @@ jx\-gitops\-repository\-export \- Exports the 'source\-config.yaml' file from th
 
 .PP
 \fB\-\-selector\fP=[]
-    adds Kubernetes label selector to filter on, e.g. \-\-selector app=pusher\-wave,heritage=Helm
+    adds Kubernetes label selector to filter on, e.g. \-\-selector app=wave,heritage=Helm
 
 .PP
 \fB\-\-selector\-target\fP=""

docs/man/man1/jx-gitops-repository-resolve.1

@@ -43,7 +43,7 @@ Resolves the git repository URL for the cluster/environment
 
 .PP
 \fB\-\-selector\fP=[]
-    adds Kubernetes label selector to filter on, e.g. \-\-selector app=pusher\-wave,heritage=Helm
+    adds Kubernetes label selector to filter on, e.g. \-\-selector app=wave,heritage=Helm
 
 .PP
 \fB\-\-selector\-target\fP=""

docs/man/man1/jx-gitops-requirement-edit.1

@@ -85,10 +85,6 @@ Edits the local 'jx\-requirements.yml file
 \fB\-h\fP, \fB\-\-help\fP[=false]
     help for edit
 
-.PP
-\fB\-\-kaniko\-sa\fP=""
-    configures the Kaniko service account name
-
 .PP
 \fB\-\-project\fP=""
     configures the Google Project ID

docs/man/man1/jx-gitops-sa-secret.1

@@ -47,7 +47,7 @@ Adds one or more secrets to the given ServiceAccount files
 
 .PP
 \fB\-\-selector\fP=[]
-    adds Kubernetes label selector to filter on, e.g. \-\-selector app=pusher\-wave,heritage=Helm
+    adds Kubernetes label selector to filter on, e.g. \-\-selector app=wave,heritage=Helm
 
 .PP
 \fB\-\-selector\-target\fP=""

docs/man/man1/jx-gitops-upgrade.1

@@ -71,6 +71,10 @@ Upgrades the GitOps git repository with the latest configuration and versions th
 \fB\-o\fP, \fB\-\-owner\fP=""
     filter on the Kptfile repository owner (user/organisation) for which packages to update
 
+.PP
+\fB\-\-release\-notes\-file\fP=""
+    the file to save any release notes in. By default any release notes will be rendered in the console
+
 .PP
 \fB\-r\fP, \fB\-\-repo\fP=""
     filter on the Kptfile repository name  for which packages to update