Fix: fail to install Kruise rollout in customized namespace

Signed-off-by: StevenLeiZhang <zhangleiic@163.com>
This commit is contained in:
StevenLeiZhang 2022-12-31 18:02:30 +08:00
parent 201a65e191
commit 9f5a64c242
3 changed files with 15 additions and 15 deletions

View File

@ -40,7 +40,7 @@ spec:
labels:
control-plane: {{ .Values.rollout.fullname }}
spec:
serviceAccountName: {{ .Values.rollout.fullname }}
serviceAccountName: {{ template "rollout.name" . }}-controller-manager
containers:
- name: {{ .Chart.Name }}
args:

View File

@ -3,13 +3,13 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ .Values.installation.namespace }}-controller-manager
name: {{ template "rollout.name" . }}-controller-manager
namespace: {{ .Values.installation.namespace }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: {{ .Values.installation.namespace }}-leader-election-role
name: {{ template "rollout.name" . }}-leader-election-role
namespace: {{ .Values.installation.namespace }}
rules:
- apiGroups:
@ -48,7 +48,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: {{ .Values.installation.namespace }}-manager-role
name: {{ template "rollout.name" . }}-manager-role
rules:
- apiGroups:
- '*'
@ -370,26 +370,26 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ .Values.installation.namespace }}-leader-election-rolebinding
name: {{ template "rollout.name" . }}-leader-election-rolebinding
namespace: {{ .Values.installation.namespace }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: {{ .Values.installation.namespace }}-leader-election-role
name: {{ template "rollout.name" . }}-leader-election-role
subjects:
- kind: ServiceAccount
name: {{ .Values.installation.namespace }}-controller-manager
name: {{ template "rollout.name" . }}-controller-manager
namespace: {{ .Values.installation.namespace }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ .Values.installation.namespace }}-manager-rolebinding
name: {{ template "rollout.name" . }}-manager-rolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: {{ .Values.installation.namespace }}-manager-role
name: {{ template "rollout.name" . }}-manager-role
subjects:
- kind: ServiceAccount
name: {{ .Values.installation.namespace }}-controller-manager
name: {{ template "rollout.name" . }}-controller-manager
namespace: {{ .Values.installation.namespace }}

View File

@ -3,14 +3,14 @@
apiVersion: admissionregistration.k8s.io/v1
kind: MutatingWebhookConfiguration
metadata:
name: {{ .Values.installation.namespace }}-mutating-webhook-configuration
name: {{ template "rollout.name" . }}-mutating-webhook-configuration
webhooks:
- admissionReviewVersions:
- v1
- v1beta1
clientConfig:
service:
name: {{ .Values.installation.namespace }}-webhook-service
name: {{ template "rollout.name" . }}-webhook-service
namespace: {{ .Values.installation.namespace }}
path: /mutate-unified-workload
failurePolicy: Fail
@ -35,7 +35,7 @@ webhooks:
- v1beta1
clientConfig:
service:
name: {{ .Values.installation.namespace }}-webhook-service
name: {{ template "rollout.name" . }}-webhook-service
namespace: {{ .Values.installation.namespace }}
path: /mutate-apps-v1-deployment
failurePolicy: Fail
@ -61,7 +61,7 @@ webhooks:
- v1beta1
clientConfig:
service:
name: {{ .Values.installation.namespace }}-webhook-service
name: {{ template "rollout.name" . }}-webhook-service
namespace: {{ .Values.installation.namespace }}
path: /mutate-apps-kruise-io-v1alpha1-cloneset
failurePolicy: Fail
@ -123,7 +123,7 @@ apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration
metadata:
creationTimestamp: null
name: {{ .Values.installation.namespace }}-validating-webhook-configuration
name: {{ template "rollout.name" . }}-validating-webhook-configuration
webhooks:
- admissionReviewVersions:
- v1