Managed clusters

Changes.md

@@ -1,6 +1,7 @@
 # Changes 
 
 ## October 3, 2022
+* 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

acm

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

clustergroup/test.yaml

@@ -32,7 +32,7 @@ clusterGroup:
       name: acm
       namespace: open-cluster-management
       project: hub
-      path: common/acm
+      path: common/managedclusters
       ignoreDifferences:
       - group: internal.open-cluster-management.io
         kind: ManagedClusterInfo

examples/values-example.yaml

@@ -36,7 +36,7 @@ clusterGroup:
       name: acm
       namespace: open-cluster-management
       project: datacenter
-      path: common/acm
+      path: common/managedclusters
       ignoreDifferences:
       - group: internal.open-cluster-management.io
         kind: ManagedClusterInfo

managedclusters/templates/acm/multiclusterhub.yaml

@@ -0,0 +1,16 @@
+{{- $haveACM := false }}
+{{- range coalesce .Values.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/templates/policies/application-policies.yaml → managedclusters/templates/acm/policies/application-policies.yaml

@@ -1,11 +1,12 @@
 # TODO: Also create a GitOpsCluster.apps.open-cluster-management.io
-{{- range .Values.clusterGroup.managedClusterGroups }}
+{{- range coalesce .Values.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
 {{- $group := . }}
 {{- if not .hostedArgoSites }}
 apiVersion: policy.open-cluster-management.io/v1
 kind: Policy
 metadata:
   name: {{ .name }}-clustergroup-policy
+  namespace: open-cluster-management
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/compare-options: IgnoreExtraneous
@@ -98,6 +99,7 @@ apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding
 metadata:
   name: {{ .name }}-placement-binding
+  namespace: open-cluster-management
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
 placementRef:
@@ -113,6 +115,7 @@ apiVersion: apps.open-cluster-management.io/v1
 kind: PlacementRule
 metadata:
   name: {{ .name }}-placement
+  namespace: open-cluster-management
 spec:
   clusterConditions:
     - status: 'True'

acm/templates/policies/ocp-gitops-policy.yaml → managedclusters/templates/acm/policies/ocp-gitops-policy.yaml

@@ -1,7 +1,15 @@
+{{- $haveACM := false }}
+{{- range coalesce .Values.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
+{{- if not .hostedArgoSites }}
+{{- $haveACM = true }}
+{{- end }}
+{{- end }}
+{{- if $haveACM }}  
 apiVersion: policy.open-cluster-management.io/v1
 kind: Policy
 metadata:
   name: openshift-gitops-policy
+  namespace: open-cluster-management
   annotations:
     policy.open-cluster-management.io/standards: NIST-CSF
     policy.open-cluster-management.io/categories: PR.DS Data Security
@@ -49,6 +57,7 @@ apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding
 metadata:
   name: openshift-gitops-placement-binding
+  namespace: open-cluster-management
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
 placementRef:
@@ -64,6 +73,7 @@ apiVersion: apps.open-cluster-management.io/v1
 kind: PlacementRule
 metadata:
   name: openshift-gitops-placement
+  namespace: open-cluster-management
 spec:
   clusterConditions:
     - status: 'True'
@@ -74,3 +84,4 @@ spec:
         operator: In
         values:
           - OpenShift
+{{- end }}

acm/templates/provision/clusterpool.yaml → managedclusters/templates/acm/provision/clusterpool.yaml

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

acm/templates/provision/secrets-aws.yaml → managedclusters/templates/acm/provision/secrets-aws.yaml

@@ -1,4 +1,4 @@
-{{- range .Values.clusterGroup.managedClusterGroups }}
+{{- range coalesce .Values.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
 {{- $group := . }}
 {{- range .clusterPools }}
 {{- $poolName := print .name "-" $group.name }}

acm/templates/provision/secrets-azure.yaml → managedclusters/templates/acm/provision/secrets-azure.yaml

@@ -1,4 +1,4 @@
-{{- range .Values.clusterGroup.managedClusterGroups }}
+{{- range coalesce .Values.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
 {{- $group := . }}
 {{- range .clusterPools }}
 {{- $poolName := print .name "-" $group.name }}

acm/templates/provision/secrets-common.yaml → managedclusters/templates/acm/provision/secrets-common.yaml

@@ -1,4 +1,4 @@
-{{- range .Values.clusterGroup.managedClusterGroups }}
+{{- range coalesce .Values.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
 {{- $group := . }}
 {{- range .clusterPools }}
 {{- $poolName := print .name "-" $group.name }}

clustergroup/templates/plumbing/hosted-sites.yaml → managedclusters/templates/argo/hosted-sites.yaml

@@ -1,5 +1,4 @@
-{{- if (eq .Values.enabled "all") }}
-{{- range .Values.clusterGroup.managedClusterGroups }}
+{{- range coalesce .Values.managedClusterGroups .Values.clusterGroup.managedClusterGroups }}
 {{- $group := . }}
 {{- if .hostedArgoSites }}
 apiVersion: argoproj.io/v1alpha1
@@ -174,4 +173,3 @@ spec:
 ---
 {{- end }}
 {{- end }}
-{{- end }}