diff --git a/README.md b/README.md index 74d76a4..e981f12 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ This chart is used by the Validated Patterns to configure ACM and manage remote |-----|------|---------|-------------| | acm.mce_operator | object | Uses the official redhat sources | Just used for IIB testing, drives the source and channel for the MCE subscription triggered by ACM | | acm.mch_spec | object | `{}` | MultiClusterHub spec (empty by default) | -| acm.spokeGitops.channel | string | `"gitops-1.18"` | Default gitops channel to install on remote clusters | +| acm.spokeGitops.channel | string | `"gitops-1.20"` | Default gitops channel to install on remote clusters | | acm.spokeGitops.source | string | `"redhat-operators"` | | | clusterGroup | object | depends on the individual settings | Dictionary of all the clustergroups of the pattern | | clusterGroup.managedClusterGroups | object | `{}` | The set of cluters managed by ACM which is running inside this clusterGroup | @@ -26,8 +26,8 @@ This chart is used by the Validated Patterns to configure ACM and manage remote | global.secretStore.backend | string | `"vault"` | | | global.targetRevision | string | `"main"` | The branch or Git reference to use to deploy the pattern | | global.vpArgoNamespace | string | `"openshift-gitops"` | The namespace where the cluster-wide ArgoCD instance runs | -| main | object | `{"gitops":{"channel":"gitops-1.18"}}` | Deprecated: Use acm.spokeGitops which takes precedence | -| main.gitops.channel | string | `"gitops-1.18"` | DEPRECATED: Default gitops channel to install on remote clusters (Use acm.spokeGitops.channel) | +| main | object | `{"gitops":{"channel":"gitops-1.20"}}` | Deprecated: Use acm.spokeGitops which takes precedence | +| main.gitops.channel | string | `"gitops-1.20"` | DEPRECATED: Default gitops channel to install on remote clusters (Use acm.spokeGitops.channel) | | secretStore | object | depends on the individual settings | Default secretstore configuration variables | | secretStore.name | string | `"vault-backend"` | Name of the clustersecretstore to be used for secrets | diff --git a/templates/policies/ocp-gitops-policy.yaml b/templates/policies/ocp-gitops-policy.yaml index 8deb40d..3f33e97 100644 --- a/templates/policies/ocp-gitops-policy.yaml +++ b/templates/policies/ocp-gitops-policy.yaml @@ -35,7 +35,7 @@ spec: name: openshift-gitops-operator namespace: {{ if $.Values.global.gitOpsSubNamespace }}{{ $.Values.global.gitOpsSubNamespace }}{{ else }}openshift-operators{{ end }} spec: - channel: {{- if and $.Values.acm.spokeGitops $.Values.acm.spokeGitops.channel }} {{ $.Values.acm.spokeGitops.channel }}{{- else if and $.Values.main $.Values.main.gitops $.Values.main.gitops.channel }} {{ $.Values.main.gitops.channel }}{{- else }} gitops-1.18{{- end }} + channel: {{- if and $.Values.acm.spokeGitops $.Values.acm.spokeGitops.channel }} {{ $.Values.acm.spokeGitops.channel }}{{- else if and $.Values.main $.Values.main.gitops $.Values.main.gitops.channel }} {{ $.Values.main.gitops.channel }}{{- else }} gitops-1.20{{- end }} installPlanApproval: Automatic name: openshift-gitops-operator source: {{- if and $.Values.acm.spokeGitops $.Values.acm.spokeGitops.source }} {{ $.Values.acm.spokeGitops.source }}{{- else if and $.Values.main $.Values.main.gitops $.Values.main.gitops.operatorSource }} {{ $.Values.main.gitops.operatorSource }}{{- else }} redhat-operators{{- end }} diff --git a/values.yaml b/values.yaml index 849888d..c319117 100644 --- a/values.yaml +++ b/values.yaml @@ -2,7 +2,7 @@ main: gitops: # -- DEPRECATED: Default gitops channel to install on remote clusters (Use acm.spokeGitops.channel) - channel: "gitops-1.18" + channel: "gitops-1.20" global: # -- List of additional value files to be passed to the pattern @@ -78,7 +78,7 @@ acm: spokeGitops: source: redhat-operators # -- Default gitops channel to install on remote clusters - channel: "gitops-1.18" + channel: "gitops-1.20" # -- Default secretstore configuration variables