Skip to content

Upgrade default gitops to 1.20 #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mbaldessari wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade default gitops to 1.20 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand All @@ -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 |

Expand Down
2 changes: 1 addition & 1 deletion templates/policies/ocp-gitops-policy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down