We don't need managedClusterGroups to be global now we have a single chart consuming it

beekhof · beekhof · commit 9d4437e71a3a · 2022-10-03T13:59:41.000+11:00
diff --git a/Changes.md b/Changes.md
@@ -1,7 +1,7 @@
 # Changes 
 
 ## October 3, 2022
-* Support both .Values.global.managedClusterGroups and the old .Values.clusterGroup.managedClusterGroups
+* Support both .Values.managedClusterGroups and the old .Values.clusterGroup.managedClusterGroups
 * Restore the ability to install a non-default site: `make TARGET_SITE=mysite install`
 * Revised tests (new output and filenames, requires adding new result files to git)
 * ACM 2.6 required for ACM-based managed sites
diff --git a/managedClusters/templates/acm/multiclusterhub.yaml b/managedClusters/templates/acm/multiclusterhub.yaml
@@ -1,5 +1,5 @@
 {{- $haveACM := false }}
-{{- range coalesce .Values.global.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
+{{- range coalesce .Values.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
 {{- if not .hostedArgoSites }}
 {{- $haveACM = true }}
 {{- end }}
diff --git a/managedClusters/templates/acm/policies/application-policies.yaml b/managedClusters/templates/acm/policies/application-policies.yaml
@@ -1,5 +1,5 @@
 # TODO: Also create a GitOpsCluster.apps.open-cluster-management.io
-{{- range coalesce .Values.global.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
+{{- range coalesce .Values.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
 {{- $group := . }}
 {{- if not .hostedArgoSites }}
 apiVersion: policy.open-cluster-management.io/v1
diff --git a/managedClusters/templates/acm/policies/ocp-gitops-policy.yaml b/managedClusters/templates/acm/policies/ocp-gitops-policy.yaml
@@ -1,5 +1,5 @@
 {{- $haveACM := false }}
-{{- range coalesce .Values.global.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
+{{- range coalesce .Values.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
 {{- if not .hostedArgoSites }}
 {{- $haveACM = true }}
 {{- end }}
diff --git a/managedClusters/templates/acm/provision/clusterpool.yaml b/managedClusters/templates/acm/provision/clusterpool.yaml
@@ -1,4 +1,4 @@
-{{- range coalesce .Values.global.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
+{{- range coalesce .Values.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
 {{- $group := . }}
 {{- if .clusterPools }}{{- /* We only create ManagedClusterSets if there are clusterPools defined */}}
 apiVersion: cluster.open-cluster-management.io/v1beta1
@@ -84,4 +84,4 @@ spec:
 {{- end }}{{- /* range .range clusters */}}
 {{- end }}{{- /* range .clusterPools */}}
 {{- end }}{{- /* if .clusterPools) */}}
-{{- end }}{{- /* range coalesce .Values.global.managedClusterGroups .Values.clusterGroup.managedClusterGroups */}}
+{{- end }}{{- /* range coalesce .Values.managedClusterGroups .Values.clusterGroup.managedClusterGroups */}}
diff --git a/managedClusters/templates/acm/provision/secrets-aws.yaml b/managedClusters/templates/acm/provision/secrets-aws.yaml
@@ -1,4 +1,4 @@
-{{- range coalesce .Values.global.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
+{{- range coalesce .Values.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
 {{- $group := . }}
 {{- range .clusterPools }}
 {{- $poolName := print .name "-" $group.name }}
diff --git a/managedClusters/templates/acm/provision/secrets-azure.yaml b/managedClusters/templates/acm/provision/secrets-azure.yaml
@@ -1,4 +1,4 @@
-{{- range coalesce .Values.global.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
+{{- range coalesce .Values.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
 {{- $group := . }}
 {{- range .clusterPools }}
 {{- $poolName := print .name "-" $group.name }}
diff --git a/managedClusters/templates/acm/provision/secrets-common.yaml b/managedClusters/templates/acm/provision/secrets-common.yaml
@@ -1,4 +1,4 @@
-{{- range coalesce .Values.global.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
+{{- range coalesce .Values.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
 {{- $group := . }}
 {{- range .clusterPools }}
 {{- $poolName := print .name "-" $group.name }}
diff --git a/managedClusters/templates/argo/hosted-sites.yaml b/managedClusters/templates/argo/hosted-sites.yaml
@@ -1,4 +1,4 @@
-{{- range coalesce .Values.global.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
+{{- range coalesce .Values.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
 {{- $group := . }}
 {{- if .hostedArgoSites }}
 apiVersion: argoproj.io/v1alpha1

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{- range coalesce .Values.global.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}`
	`1`	`+{{- range coalesce .Values.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}`
`2`	`2`	`{{- $group := . }}`
`3`	`3`	`{{- range .clusterPools }}`
`4`	`4`	`{{- $poolName := print .name "-" $group.name }}`