From 9d4437e71a3a378a8df6e5760fc2436fd8401ee1 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <andrew@beekhof.net>
Date: Mon, 3 Oct 2022 13:59:41 +1100
Subject: [PATCH] We don't need managedClusterGroups to be global now we have a
 single chart consuming it

---
 Changes.md                                                    | 2 +-
 managedClusters/templates/acm/multiclusterhub.yaml            | 2 +-
 .../templates/acm/policies/application-policies.yaml          | 2 +-
 managedClusters/templates/acm/policies/ocp-gitops-policy.yaml | 2 +-
 managedClusters/templates/acm/provision/clusterpool.yaml      | 4 ++--
 managedClusters/templates/acm/provision/secrets-aws.yaml      | 2 +-
 managedClusters/templates/acm/provision/secrets-azure.yaml    | 2 +-
 managedClusters/templates/acm/provision/secrets-common.yaml   | 2 +-
 managedClusters/templates/argo/hosted-sites.yaml              | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Changes.md b/Changes.md
index efd27f2b..ec69a394 100644
--- 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
index 94f017bd..da039682 100644
--- 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
index a0cfc2ba..ef53557f 100644
--- 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
index 30ad5e93..61028d5f 100644
--- 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
index 0b8a9a34..a2f4bb17 100644
--- 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
index 0ea4ec8a..c65e986b 100644
--- 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
index 6f054737..306b8613 100644
--- 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
index f95091dd..892cbd9a 100644
--- 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
index 0f605715..a48dd9bc 100644
--- 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