update cma

Signed-off-by: Zhiwei Yin <[email protected]>
stolostron · Oct 9, 2024 · e0d791d · e0d791d
1 parent a9552fe
commit e0d791d
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 9 deletions.
diff --git a/configuration/addonhostedconfig.yaml b/configuration/addonhostedconfig.yaml
@@ -0,0 +1,9 @@
+apiVersion: addon.open-cluster-management.io/v1alpha1
+kind: AddOnDeploymentConfig
+metadata:
+  name: addon-hosted-config
+  namespace: multicluster-engine
+spec:
+  customizedVariables:
+    - name: managedKubeConfigSecret
+      value: external-managed-kubeconfig
diff --git a/configuration/workmanagercma.yaml b/configuration/workmanagercma.yaml
@@ -0,0 +1,23 @@
+apiVersion: addon.open-cluster-management.io/v1alpha1
+kind: ClusterManagementAddOn
+metadata:
+  annotations:
+    addon.open-cluster-management.io/lifecycle: addon-manager
+  name: work-manager
+spec:
+  addOnMeta:
+    description: work-manager provides action, view and rbac settings
+    displayName: work-manager
+  installStrategy:
+    placements:
+    - name: global
+      namespace: open-cluster-management-global-set
+      rolloutStrategy:
+        type: All
+    type: Placements
+  supportedConfigs:
+  - defaultConfig:
+      name: addon-hosted-config
+      namespace: multicluster-engine
+    group: addon.open-cluster-management.io
+    resource: addondeploymentconfigs
diff --git a/hack/e2e.sh b/hack/e2e.sh
@@ -69,6 +69,11 @@ echo ""
 echo "###### Wait unitl MCE CR is Available ######"
 waitForReady "kubectl get mce multiclusterengine | grep -c \"Available\""  1
 
+echo ""
+echo "###### create addonhostedconfig ######"
+kubectl apply -f ./configuration/addonhostedconfig.yaml
+
+
 echo ""
 echo "#### Install Policy addons #####"
 make install-policy

diff --git a/policy/charts/cluster-lifecycle/values.yaml b/policy/charts/cluster-lifecycle/values.yaml
@@ -9,6 +9,6 @@ global:
 hubconfig:
   nodeSelector: null
   proxyConfigs: {}
-  replicaCount: 1
+  replicaCount: 2
   tolerations: []
 org: open-cluster-management
diff --git a/policy/charts/grc/templates/config-policy-clustermanagementaddon.yaml b/policy/charts/grc/templates/config-policy-clustermanagementaddon.yaml
@@ -9,3 +9,5 @@ spec:
   supportedConfigs:
     - group: addon.open-cluster-management.io
       resource: addondeploymentconfigs
+      defaultConfig:
+      {{- toYaml .Values.global.cma.defaultConfig | nindent 8 }}
diff --git a/policy/charts/grc/templates/governance-policy-framework-clustermanagementaddon.yaml b/policy/charts/grc/templates/governance-policy-framework-clustermanagementaddon.yaml
@@ -9,3 +9,6 @@ spec:
   supportedConfigs:
     - group: addon.open-cluster-management.io
       resource: addondeploymentconfigs
+      defaultConfig:
+      {{- toYaml .Values.global.cma.defaultConfig | nindent 8 }}
+
diff --git a/policy/charts/grc/values.yaml b/policy/charts/grc/values.yaml
@@ -12,9 +12,13 @@ global:
   pullSecret: null
   pullPolicy: Always
   hubSize: Small
+
+  cma:
+    defaultConfig: {}
+
 hubconfig:
   nodeSelector: null
   proxyConfigs: {}
-  replicaCount: 1
+  replicaCount: 2
   tolerations: []
 org: open-cluster-management
diff --git a/policy/values.yaml b/policy/values.yaml
@@ -15,10 +15,8 @@ global:
     # klusterlet_addon_controller: "registry.redhat.io/rhacm2/klusterlet-addon-controller-rhel9@sha256:478e3e6cda0d74f43b0f05911d023344108a5cd79d57d5cc9f268ad064848a00"
   namespace: multicluster-engine
   pullSecret: open-cluster-management-image-pull-credentials
-grc:
-  hubconfig:
-    replicaCount: 2
-
-cluster-lifecycle:
-  hubconfig:
-    replicaCount: 2
+
+  cma:
+    defaultConfig:
+      name: addon-hosted-config
+      namespace: multicluster-engine