Add helm variables to choose controllers of karmada and kubernetes ma…

…nager Signed-off-by: fredgate <barriere.fr@gmail.com>
karmada-io · Sep 19, 2022 · 55744e0 · 55744e0
1 parent 516e095
commit 55744e0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/charts/karmada/templates/karmada-controller-manager.yaml b/charts/karmada/templates/karmada-controller-manager.yaml
@@ -50,6 +50,9 @@ spec:
             - /bin/karmada-controller-manager
             - --kubeconfig=/etc/kubeconfig
             - --bind-address=0.0.0.0
+            {{- if .Values.controllerManager.config.controllers }}
+            - --controllers={{ .Values.controllerManager.config.controllers }}
+            {{- end }}
             - --cluster-status-update-frequency=10s
             - --secure-port=10357
             - --leader-elect-resource-namespace={{ include "karmada.namespace" . }}

diff --git a/charts/karmada/templates/kube-controller-manager.yaml b/charts/karmada/templates/kube-controller-manager.yaml
@@ -53,7 +53,7 @@ spec:
             - --cluster-name=karmada
             - --cluster-signing-cert-file=/etc/karmada/pki/server-ca.crt
             - --cluster-signing-key-file=/etc/karmada/pki/server-ca.key
-            - --controllers=namespace,garbagecollector,serviceaccount-token,ttl-after-finished,bootstrapsigner,csrapproving,csrcleaner,csrsigning
+            - --controllers={{ .Values.kubeControllerManager.config.controllers }}
             - --kubeconfig=/etc/kubeconfig
             - --leader-elect=true
             - --node-cidr-mask-size=24

diff --git a/charts/karmada/values.yaml b/charts/karmada/values.yaml
@@ -261,6 +261,9 @@ controllerManager:
     ##   - myRegistryKeySecretName
     ##
     pullSecrets: []
+  ## @param controllerManager.config.controllers the controllers launched by the manager.
+  config:
+    controllers: ""
   ## @param controllerManager.resources resource quota of the karmada-controller-manager
   resources: {}
     # If you do want to specify resources, uncomment the following
@@ -458,6 +461,9 @@ kubeControllerManager:
     ##   - myRegistryKeySecretName
     ##
     pullSecrets: []
+  ## @param kubeControllerManager.config.controllers the controllers launched by the kubernetes manager.
+  config:
+    controllers: namespace,garbagecollector,serviceaccount-token,ttl-after-finished,bootstrapsigner,csrapproving,csrcleaner,csrsigning
   ## @param kubeControllerManager.resources resource quota of the kube-controller-manager
   resources:
     # If you do want to specify resources, uncomment the following