diff --git a/charts/karmada/templates/karmada-controller-manager.yaml b/charts/karmada/templates/karmada-controller-manager.yaml index 1d042137770d..94713f1f0bfe 100644 --- a/charts/karmada/templates/karmada-controller-manager.yaml +++ b/charts/karmada/templates/karmada-controller-manager.yaml @@ -53,9 +53,6 @@ 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 index 285edc240b61..2bc7b22e1e31 100644 --- 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={{ .Values.kubeControllerManager.config.controllers }} + - --controllers={{ .Values.kubeControllerManager.controllers }} - --kubeconfig=/etc/kubeconfig - --leader-elect=true - --node-cidr-mask-size=24 diff --git a/charts/karmada/values.yaml b/charts/karmada/values.yaml index 3ca77d9c3060..f3466f0cf3b8 100644 --- a/charts/karmada/values.yaml +++ b/charts/karmada/values.yaml @@ -268,9 +268,7 @@ 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 @@ -473,9 +471,7 @@ 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 @@ -500,6 +496,7 @@ kubeControllerManager: rollingUpdate: maxUnavailable: 0 maxSurge: 50% + controllers: namespace,garbagecollector,serviceaccount-token,ttl-after-finished,bootstrapsigner,csrapproving,csrcleaner,csrsigning ## etcd config etcd: