Browse Source

User global.serviceAccountName to populate ServiceAccount, ClusterRole, and ClusterRoleBinding

pull/5050/head
jessebot 1 year ago
committed by Chris Lu
parent
commit
aff03c1d00
  1. 2
      k8s/charts/seaweedfs/Chart.yaml
  2. 10
      k8s/charts/seaweedfs/templates/service-account.yaml
  3. 2
      k8s/charts/seaweedfs/values.yaml

2
k8s/charts/seaweedfs/Chart.yaml

@ -2,4 +2,4 @@ apiVersion: v1
description: SeaweedFS description: SeaweedFS
name: seaweedfs name: seaweedfs
appVersion: "3.59" appVersion: "3.59"
version: 3.59.3
version: 3.59.4

10
k8s/charts/seaweedfs/templates/service-account.yaml

@ -4,7 +4,7 @@
kind: ClusterRole kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
metadata: metadata:
name: seaweedfs-rw-cr
name: {{ .Values.global.serviceAccountName }}-rw-cr
labels: labels:
app.kubernetes.io/name: {{ template "seaweedfs.name" . }} app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
@ -18,7 +18,7 @@ rules:
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: seaweedfs-rw-sa
name: {{ .Values.global.serviceAccountName }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
labels: labels:
app.kubernetes.io/name: {{ template "seaweedfs.name" . }} app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@ -29,7 +29,7 @@ metadata:
kind: ClusterRoleBinding kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
metadata: metadata:
name: system:serviceaccount:seaweedfs-rw-sa:default
name: system:serviceaccount:{{ .Values.global.serviceAccountName }}:default
labels: labels:
app.kubernetes.io/name: {{ template "seaweedfs.name" . }} app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
@ -37,10 +37,10 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: seaweedfs-rw-sa
name: {{ .Values.global.serviceAccountName }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: ClusterRole kind: ClusterRole
name: seaweedfs-rw-cr
name: {{ .Values.global.serviceAccountName }}-rw-cr
{{- end }} {{- end }}

2
k8s/charts/seaweedfs/values.yaml

@ -16,6 +16,8 @@ global:
volumeRead: false volumeRead: false
filerWrite: false filerWrite: false
filerRead: false filerRead: false
# we will use this serviceAccountName for all ClusterRoles/ClusterRoleBindings
serviceAccountName: "seaweedfs"
certificates: certificates:
alphacrds: false alphacrds: false
monitoring: monitoring:

Loading…
Cancel
Save