diff --git a/config/ks-core/templates/ks-console.yml b/config/ks-core/templates/ks-console.yml index ef5620986..3246dc9a5 100644 --- a/config/ks-core/templates/ks-console.yml +++ b/config/ks-core/templates/ks-console.yml @@ -44,8 +44,8 @@ spec: periodSeconds: 10 successThreshold: 1 failureThreshold: 8 - serviceAccount: kubesphere - serviceAccountName: kubesphere + serviceAccount: {{ include "ks-core.serviceAccountName" . }} + serviceAccountName: {{ include "ks-core.serviceAccountName" . }} {{- with .Values.tolerations }} tolerations: {{- toYaml . | nindent 8 }} diff --git a/config/ks-core/templates/serviceaccount.yaml b/config/ks-core/templates/serviceaccount.yaml index 0fa0ba760..412d3c2e3 100644 --- a/config/ks-core/templates/serviceaccount.yaml +++ b/config/ks-core/templates/serviceaccount.yaml @@ -15,12 +15,12 @@ metadata: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: kubesphere + name: {{ include "ks-core.serviceAccountName" . }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole name: cluster-admin subjects: - kind: ServiceAccount - name: kubesphere + name: {{ include "ks-core.serviceAccountName" . }} namespace: {{ .Release.Namespace }} diff --git a/config/ks-core/templates/webhook.yaml b/config/ks-core/templates/webhook.yaml index 4276ba507..fee6671e3 100644 --- a/config/ks-core/templates/webhook.yaml +++ b/config/ks-core/templates/webhook.yaml @@ -1,7 +1,7 @@ {{- $ca := genCA "ks-controller-manager-ca" 3650 }} {{- $cn := printf "%s-admission-webhook" .Release.Name }} -{{- $altName1 := printf "ks-controller-manager.kubesphere-system" }} -{{- $altName2 := printf "ks-controller-manager.kubesphere-system.svc" }} +{{- $altName1 := printf "ks-controller-manager.%s" .Release.Namespace }} +{{- $altName2 := printf "ks-controller-manager.%s.svc" .Release.Namespace }} {{- $cert := genSignedCert $cn nil (list $altName1 $altName2) 3650 $ca }} apiVersion: v1