Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add controllers config for karmada-controller-manager #3255

Merged
merged 1 commit into from
Mar 13, 2023
Merged

Add controllers config for karmada-controller-manager #3255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions charts/karmada/templates/karmada-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" . }}
Expand Down
2 changes: 1 addition & 1 deletion charts/karmada/templates/kube-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions charts/karmada/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -500,6 +496,7 @@ kubeControllerManager:
rollingUpdate:
maxUnavailable: 0
maxSurge: 50%
controllers: namespace,garbagecollector,serviceaccount-token,ttl-after-finished,bootstrapsigner,csrapproving,csrcleaner,csrsigning
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a blank line here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I mean add a blank between it and the etcd config.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😄😄
Rebased it.


## etcd config
etcd:
Expand Down