Merge branch 'open-cluster-management-io:main' into main

stolostron · May 20, 2024 · 2a0d5a7 · 2a0d5a7
2 parents 5b65bb9 + 507cd86
commit 2a0d5a7
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/charts/managed-serviceaccount/templates/addondeploymentconfig.yaml b/charts/managed-serviceaccount/templates/addondeploymentconfig.yaml
diff --git a/charts/managed-serviceaccount/templates/addontemplate.yaml b/charts/managed-serviceaccount/templates/addontemplate.yaml
@@ -15,7 +15,7 @@ spec:
         metadata:
           annotations:
             addon.open-cluster-management.io/deletion-orphan: ""
-          name: '{{ `{{INSTALL_NAMESPACE}}` }}'
+          name: open-cluster-management-agent-addon
       - apiVersion: rbac.authorization.k8s.io/v1
         kind: ClusterRole
         metadata:

diff --git a/charts/managed-serviceaccount/templates/clustermanagementaddon.yaml b/charts/managed-serviceaccount/templates/clustermanagementaddon.yaml
@@ -16,9 +16,6 @@ spec:
     resource: addondeploymentconfigs
 {{- end }}
 {{- if eq .Values.hubDeployMode "AddOnTemplate" }}
-    defaultConfig:
-      namespace: {{ .Release.Namespace }}
-      name: managed-serviceaccount-addon-deploy-config
   - group: addon.open-cluster-management.io
     resource: addontemplates
     defaultConfig: