Combine hosted argo sites with acm into a managedClusters chart

Author: beekhof

Changes.md

@@ -1,6 +1,7 @@
 # Changes 
 
 ## October 3, 2022
+* Support both .Values.global.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

acm

@@ -0,0 +1 @@
+managedClusters

acm/templates/multiclusterhub.yaml

@@ -0,0 +1,16 @@
+{{- $haveACM := false }}
+{{- range coalesce .Values.global.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
+{{- if not .hostedArgoSites }}
+{{- $haveACM = true }}
+{{- end }}
+{{- end }}
+{{- if $haveACM }}  
+apiVersion: operator.open-cluster-management.io/v1
+kind: MultiClusterHub
+metadata:
+  name: multiclusterhub
+  namespace: open-cluster-management
+  annotations:
+    argocd.argoproj.io/sync-wave: "-1"
+spec: {}
+{{- end }}

acm/.helmignore managedClusters/.helmignoreacm/.helmignore renamed to managedClusters/.helmignore

@@ -1,5 +1,5 @@
 # TODO: Also create a GitOpsCluster.apps.open-cluster-management.io
-{{- range .Values.clusterGroup.managedClusterGroups }}
+{{- range coalesce .Values.global.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
 {{- $group := . }}
 {{- if not .hostedArgoSites }}
 apiVersion: policy.open-cluster-management.io/v1

acm/Chart.yaml managedClusters/Chart.yamlacm/Chart.yaml renamed to managedClusters/Chart.yaml

@@ -1,3 +1,10 @@
+{{- $haveACM := false }}
+{{- range coalesce .Values.global.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
+{{- if not .hostedArgoSites }}
+{{- $haveACM = true }}
+{{- end }}
+{{- end }}
+{{- if $haveACM }}  
 apiVersion: policy.open-cluster-management.io/v1
 kind: Policy
 metadata:
@@ -74,3 +81,4 @@ spec:
         operator: In
         values:
           - OpenShift
+{{- end }}

managedClusters/templates/acm/multiclusterhub.yaml

@@ -1,4 +1,4 @@
-{{- range .Values.clusterGroup.managedClusterGroups }}
+{{- range coalesce .Values.global.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 .Values.clusterGroup.managedClusterGroups */}}
+{{- end }}{{- /* range coalesce .Values.global.managedClusterGroups .Values.clusterGroup.managedClusterGroups */}}