use helm release variable for service account name and namespace
Signed-off-by: Roland.Ma <rolandma@yunify.com>
This commit is contained in:
@@ -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 }}
|
||||
|
||||
@@ -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 }}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user