karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3255 from yanggangtony/helm-controllers 

Add controllers config for karmada-controller-manager
This commit is contained in:
karmada-bot 2023-03-13 09:16:17 +08:00 committed by GitHub
parent 6dc431deca ce9df6dffb
commit 2256a0a31e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
charts/karmada/templates/karmada-controller-manager.yaml
View File

@ -53,9 +53,6 @@ spec:
- /bin/karmada-controller-manager - /bin/karmada-controller-manager
- --kubeconfig=/etc/kubeconfig - --kubeconfig=/etc/kubeconfig
- --bind-address=0.0.0.0 - --bind-address=0.0.0.0
{{- if .Values.controllerManager.config.controllers }}
- --controllers={{ .Values.controllerManager.config.controllers }}
{{- end }}
- --cluster-status-update-frequency=10s - --cluster-status-update-frequency=10s
- --secure-port=10357 - --secure-port=10357
- --leader-elect-resource-namespace={{ include "karmada.namespace" . }} - --leader-elect-resource-namespace={{ include "karmada.namespace" . }}

2
charts/karmada/templates/kube-controller-manager.yaml
View File

@ -53,7 +53,7 @@ spec:
- --cluster-name=karmada - --cluster-name=karmada
- --cluster-signing-cert-file=/etc/karmada/pki/server-ca.crt - --cluster-signing-cert-file=/etc/karmada/pki/server-ca.crt
- --cluster-signing-key-file=/etc/karmada/pki/server-ca.key - --cluster-signing-key-file=/etc/karmada/pki/server-ca.key
- --controllers={{ .Values.kubeControllerManager.config.controllers }} - --controllers={{ .Values.kubeControllerManager.controllers }}
- --kubeconfig=/etc/kubeconfig - --kubeconfig=/etc/kubeconfig
- --leader-elect=true - --leader-elect=true
- --node-cidr-mask-size=24 - --node-cidr-mask-size=24

9
charts/karmada/values.yaml
View File

@ -268,9 +268,7 @@ controllerManager:
## - myRegistryKeySecretName ## - myRegistryKeySecretName
## ##
pullSecrets: [] pullSecrets: []
## @param controllerManager.config.controllers the controllers launched by the manager.
config:
controllers: ""
## @param controllerManager.resources resource quota of the karmada-controller-manager ## @param controllerManager.resources resource quota of the karmada-controller-manager
resources: {} resources: {}
# If you do want to specify resources, uncomment the following # If you do want to specify resources, uncomment the following
@ -473,9 +471,7 @@ kubeControllerManager:
## - myRegistryKeySecretName ## - myRegistryKeySecretName
## ##
pullSecrets: [] 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 ## @param kubeControllerManager.resources resource quota of the kube-controller-manager
resources: resources:
# If you do want to specify resources, uncomment the following # If you do want to specify resources, uncomment the following
@ -500,6 +496,7 @@ kubeControllerManager:
rollingUpdate: rollingUpdate:
maxUnavailable: 0 maxUnavailable: 0
maxSurge: 50% maxSurge: 50%
controllers: namespace,garbagecollector,serviceaccount-token,ttl-after-finished,bootstrapsigner,csrapproving,csrcleaner,csrsigning
## etcd config ## etcd config
etcd: etcd: