Merge pull request #4009 from Vacant2333/fix_helm_install_clusterrole_to_wrong_cluster
fix helm install clusterrole to wrong cluster
This commit is contained in:
commit
708096ec14
|
@ -1,3 +1,4 @@
|
||||||
|
{{- define "karmada.clusterrole" -}}
|
||||||
# This configuration is used to grant the admin clusterrole read
|
# This configuration is used to grant the admin clusterrole read
|
||||||
# and write permissions for Karmada resources.
|
# and write permissions for Karmada resources.
|
||||||
|
|
||||||
|
@ -147,3 +148,4 @@ rules:
|
||||||
- deletecollection
|
- deletecollection
|
||||||
- patch
|
- patch
|
||||||
- update
|
- update
|
||||||
|
{{- end -}}
|
|
@ -135,7 +135,8 @@ data:
|
||||||
{{- include "karmada.proxyRbac" . | nindent 8 }}
|
{{- include "karmada.proxyRbac" . | nindent 8 }}
|
||||||
{{- print "bootstrap-token-configuration.yaml: " | nindent 6 }} |-
|
{{- print "bootstrap-token-configuration.yaml: " | nindent 6 }} |-
|
||||||
{{- include "karmada.bootstrapToken.configuration" . | nindent 8 }}
|
{{- include "karmada.bootstrapToken.configuration" . | nindent 8 }}
|
||||||
|
{{- print "clusterrole.yaml: " | nindent 6 }} |-
|
||||||
|
{{- include "karmada.clusterrole" . | nindent 8 }}
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
|
@ -242,6 +243,8 @@ data:
|
||||||
{{- include "karmada.proxyRbac" . | nindent 8 }}
|
{{- include "karmada.proxyRbac" . | nindent 8 }}
|
||||||
{{- print "bootstrap-token-configuration.yaml: " | nindent 6 }} |-
|
{{- print "bootstrap-token-configuration.yaml: " | nindent 6 }} |-
|
||||||
{{- include "karmada.bootstrapToken.configuration" . | nindent 8 }}
|
{{- include "karmada.bootstrapToken.configuration" . | nindent 8 }}
|
||||||
|
{{- print "clusterrole.yaml: " | nindent 6 }} |-
|
||||||
|
{{- include "karmada.clusterrole" . | nindent 8 }}
|
||||||
crds-patches-configmaps.yaml: |-
|
crds-patches-configmaps.yaml: |-
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
|
|
|
@ -526,7 +526,7 @@ kubeControllerManager:
|
||||||
rollingUpdate:
|
rollingUpdate:
|
||||||
maxUnavailable: 0
|
maxUnavailable: 0
|
||||||
maxSurge: 50%
|
maxSurge: 50%
|
||||||
controllers: namespace,garbagecollector,serviceaccount-token,ttl-after-finished,bootstrapsigner,tokencleaner,csrapproving,csrcleaner,csrsigning
|
controllers: namespace,garbagecollector,serviceaccount-token,ttl-after-finished,bootstrapsigner,tokencleaner,csrapproving,csrcleaner,csrsigning,clusterrole-aggregation
|
||||||
## @param apiServer.podDisruptionBudget
|
## @param apiServer.podDisruptionBudget
|
||||||
podDisruptionBudget: *podDisruptionBudget
|
podDisruptionBudget: *podDisruptionBudget
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue