🐛 Remove the enableAddOnDeploymentConfig value (#114)

* Fix helm template error Signed-off-by: zhujian <jiazhu@redhat.com> * Remove the enableAddOnDeploymentConfig value Signed-off-by: zhujian <jiazhu@redhat.com> --------- Signed-off-by: zhujian <jiazhu@redhat.com>
open-cluster-management-io · Jun 20, 2024 · 43435c4 · 43435c4
1 parent 36dc2b2
commit 43435c4
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/.github/workflows/go-presubmit.yml b/.github/workflows/go-presubmit.yml
@@ -94,8 +94,7 @@ jobs:
              -n open-cluster-management-addon --create-namespace \
              managed-serviceaccount charts/managed-serviceaccount/ \
              --set tag=latest \
-             --set featureGates.ephemeralIdentity=true \
-             --set enableAddOnDeploymentConfig=true
+             --set featureGates.ephemeralIdentity=true
       - name: Run e2e test
         run: make test-e2e GENKGO_ARGS='--ginkgo.label-filter='\''!template-install'\'''
 
@@ -133,7 +132,6 @@ jobs:
             managed-serviceaccount charts/managed-serviceaccount/ \
             --set tag=latest \
             --set featureGates.ephemeralIdentity=true \
-            --set enableAddOnDeploymentConfig=true \
             --set hubDeployMode=AddOnTemplate \
             --set targetCluster=loopback
       - name: Run e2e test

diff --git a/charts/managed-serviceaccount/templates/clustermanagementaddon.yaml b/charts/managed-serviceaccount/templates/clustermanagementaddon.yaml
@@ -10,11 +10,9 @@ spec:
   addOnMeta:
     displayName: managed-serviceaccount
     description: managed-serviceaccount
-{{- if .Values.enableAddOnDeploymentConfig }}
   supportedConfigs:
   - group: addon.open-cluster-management.io
     resource: addondeploymentconfigs
-{{- end }}
 {{- if eq .Values.hubDeployMode "AddOnTemplate" }}
   - group: addon.open-cluster-management.io
     resource: addontemplates

diff --git a/charts/managed-serviceaccount/values.yaml b/charts/managed-serviceaccount/values.yaml
@@ -6,8 +6,6 @@ agentInstallAll: true
 # Number of replicas
 replicas: 1
 
-enableAddOnDeploymentConfig: false
-
 featureGates:
   ephemeralIdentity: false