Skip to content

Commit 2a7d9f5

Browse files
cabrinhacabrinha
committed
Fixup service account naming and annotations
1 parent a771a0f commit 2a7d9f5

File tree

11 files changed

+98
-19
lines changed

11 files changed

+98
-19
lines changed

‎dist/chart/templates/_helpers.tpl‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,60 @@ Create the name of the service account to use
9191
{{- default "default" .Values.serviceAccount.name }}
9292
{{- end }}
9393
{{- end }}
94+
95+
{{/*
96+
Create the name of the controller manager service account
97+
*/}}
98+
{{- define "aibrix.controllerManager.serviceAccountName" -}}
99+
{{- if and .Values.controllerManager.serviceAccount.create (eq .Values.controllerManager.serviceAccount.name "") -}}
100+
{{- $sa := default (include "aibrix.fullname" .) .Values.controllerManager.serviceAccount.name }}
101+
{{- printf "%s-controller-manager" $sa }}
102+
{{- else if and .Values.controllerManager.serviceAccount.create (not (eq .Values.controllerManager.serviceAccount.name "")) -}}
103+
{{- .Values.controllerManager.serviceAccount.name -}}
104+
{{- else -}}
105+
{{- include "aibrix.serviceAccountName" . -}}
106+
{{- end -}}
107+
{{- end -}}
108+
109+
{{/*
110+
Create the name of the gateway plugin service account
111+
*/}}
112+
{{- define "aibrix.gatewayPlugin.serviceAccountName" -}}
113+
{{- if and .Values.gatewayPlugin.serviceAccount.create (eq .Values.gatewayPlugin.serviceAccount.name "") -}}
114+
{{- $sa := default (include "aibrix.fullname" .) .Values.gatewayPlugin.serviceAccount.name }}
115+
{{- printf "%s-gateway-plugin" $sa }}
116+
{{- else if and .Values.gatewayPlugin.serviceAccount.create (not (eq .Values.gatewayPlugin.serviceAccount.name "")) -}}
117+
{{- .Values.gatewayPlugin.serviceAccount.name -}}
118+
{{- else -}}
119+
{{- include "aibrix.serviceAccountName" . -}}
120+
{{- end -}}
121+
{{- end -}}
122+
123+
124+
{{/*
125+
Create the name of the gateway plugin service account
126+
*/}}
127+
{{- define "aibrix.gpuOptimizer.serviceAccountName" -}}
128+
{{- if and .Values.gpuOptimizer.serviceAccount.create (eq .Values.gpuOptimizer.serviceAccount.name "") -}}
129+
{{- $sa := default (include "aibrix.fullname" .) .Values.gpuOptimizer.serviceAccount.name }}
130+
{{- printf "%s-gpu-optimizer" $sa }}
131+
{{- else if and .Values.gpuOptimizer.serviceAccount.create (not (eq .Values.gpuOptimizer.serviceAccount.name "")) -}}
132+
{{- .Values.gpuOptimizer.serviceAccount.name -}}
133+
{{- else -}}
134+
{{- include "aibrix.serviceAccountName" . -}}
135+
{{- end -}}
136+
{{- end -}}
137+
138+
{{/*
139+
Create the name of the metadata service service account
140+
*/}}
141+
{{- define "aibrix.metadata.serviceAccountName" -}}
142+
{{- if and .Values.metadata.serviceAccount.create (eq .Values.metadata.serviceAccount.name "") -}}
143+
{{- $sa := default (include "aibrix.fullname" .) .Values.metadata.serviceAccount.name }}
144+
{{- printf "%s-metadata-service" $sa }}
145+
{{- else if and .Values.metadata.serviceAccount.create (not (eq .Values.metadata.serviceAccount.name "")) -}}
146+
{{- .Values.metadata.serviceAccount.name -}}
147+
{{- else -}}
148+
{{- include "aibrix.serviceAccountName" . -}}
149+
{{- end -}}
150+
{{- end -}}

‎dist/chart/templates/controller-manager/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ spec:
5252
readOnly: true
5353
securityContext:
5454
runAsNonRoot: true
55-
serviceAccountName: {{ include "aibrix.serviceAccountName" . }}-controller-manager
55+
serviceAccountName: {{ include "aibrix.controllerManager.serviceAccountName" . }}
5656
terminationGracePeriodSeconds: 10
5757
volumes:
5858
- name: cert

‎dist/chart/templates/controller-manager/rbac.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
apiVersion: v1
22
kind: ServiceAccount
33
metadata:
4+
name: {{ include "aibrix.controllerManager.serviceAccountName" . }}
5+
annotations:
6+
{{- toYaml .Values.controllerManager.serviceAccount.annotations | nindent 4 }}
47
labels:
58
{{- include "aibrix.labels" . | nindent 4 }}
6-
name: {{ include "aibrix.serviceAccountName" . }}-controller-manager
79
---
810
apiVersion: rbac.authorization.k8s.io/v1
911
kind: ClusterRole
@@ -312,14 +314,13 @@ roleRef:
312314
name: {{ include "aibrix.fullname" . }}-controller-manager
313315
subjects:
314316
- kind: ServiceAccount
315-
name: {{ include "aibrix.serviceAccountName" . }}-controller-manager
317+
name: {{ include "aibrix.controllerManager.serviceAccountName" . }}
316318
namespace: {{ .Release.Namespace }}
317319
---
318320
apiVersion: rbac.authorization.k8s.io/v1
319321
kind: Role
320322
metadata:
321323
name: {{ include "aibrix.fullname" . }}-controller-manager-leader-election
322-
namespace: {{ .Release.Namespace }}
323324
labels:
324325
{{- include "aibrix.labels" . | nindent 4 }}
325326
rules:
@@ -367,5 +368,5 @@ roleRef:
367368
name: {{ include "aibrix.fullname" . }}-controller-manager-leader-election
368369
subjects:
369370
- kind: ServiceAccount
370-
name: {{ include "aibrix.serviceAccountName" . }}-controller-manager
371+
name: {{ include "aibrix.controllerManager.serviceAccountName" . }}
371372
namespace: {{ .Release.Namespace }}

‎dist/chart/templates/gateway-instance/gateway.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec:
6262
app.kubernetes.io/name: envoy
6363
app.kubernetes.io/component: proxy
6464
spec:
65-
{{- include "aibrix.imagePullSecrets" (dict "componentSecrets" .Values.gateway.envoyProxy.imagePullSecrets "globalSecrets") | nindent 18 }}
65+
{{- include "aibrix.imagePullSecrets" (dict "componentSecrets" .Values.gateway.envoyProxy.imagePullSecrets "globalSecrets" .Values.global.imagePullSecrets) | nindent 18 }}
6666
containers:
6767
- name: envoy
6868
image: {{ .Values.gateway.envoyProxy.container.envoy.image }}

‎dist/chart/templates/gateway-plugin/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,5 +107,5 @@ spec:
107107
{{- toYaml .Values.gatewayPlugin.container.probes.liveness | nindent 12 }}
108108
readinessProbe:
109109
{{- toYaml .Values.gatewayPlugin.container.probes.readiness | nindent 12 }}
110-
serviceAccountName: {{ include "aibrix.serviceAccountName" . }}-gateway-plugins
110+
serviceAccountName: {{ include "aibrix.gatewayPlugin.serviceAccountName" . }}
111111
{{- end }}

‎dist/chart/templates/gateway-plugin/rbac.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
apiVersion: v1
44
kind: ServiceAccount
55
metadata:
6+
name: {{ include "aibrix.gatewayPlugin.serviceAccountName" . }}
7+
annotations:
8+
{{- toYaml .Values.gatewayPlugin.serviceAccount.annotations | nindent 4 }}
69
labels:
710
{{- include "aibrix.labels" . | nindent 4 }}
811
app.kubernetes.io/component: aibrix-gateway-plugin
9-
name: {{ include "aibrix.serviceAccountName" . }}-gateway-plugins
1012
---
1113

1214
apiVersion: rbac.authorization.k8s.io/v1
@@ -63,6 +65,6 @@ roleRef:
6365
name: {{ include "aibrix.fullname" . }}-gateway-plugins
6466
subjects:
6567
- kind: ServiceAccount
66-
name: {{ include "aibrix.serviceAccountName" . }}-gateway-plugins
68+
name: {{ include "aibrix.gatewayPlugin.serviceAccountName" . }}
6769
namespace: {{ .Release.Namespace }}
6870
{{- end }}

‎dist/chart/templates/gpu-optimizer/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
{{- include "aibrix.labels" . | nindent 8 }}
1818
app.kubernetes.io/component: aibrix-gpu-optimizer
1919
spec:
20-
serviceAccountName: {{ include "aibrix.serviceAccountName" . }}-gpu-optimizer
20+
serviceAccountName: {{ include "aibrix.gpuOptimizer.serviceAccountName" . }}
2121
automountServiceAccountToken: true
2222
{{- include "aibrix.imagePullSecrets" (dict "componentSecrets" .Values.gpuOptimizer.imagePullSecrets "globalSecrets" .Values.global.imagePullSecrets) | nindent 6 }}
2323
containers:

‎dist/chart/templates/gpu-optimizer/rbac.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
apiVersion: v1
22
kind: ServiceAccount
33
metadata:
4-
name: {{ include "aibrix.serviceAccountName" . }}-gpu-optimizer
4+
name: {{ include "aibrix.gpuOptimizer.serviceAccountName" . }}
5+
annotations:
6+
{{- toYaml .Values.gpuOptimizer.serviceAccount.annotations | nindent 4 }}
57
labels:
68
{{- include "aibrix.labels" . | nindent 4 }}
79
app.kubernetes.io/component: aibrix-gpu-optimizer
@@ -27,7 +29,7 @@ metadata:
2729
app.kubernetes.io/component: aibrix-gpu-optimizer
2830
subjects:
2931
- kind: ServiceAccount
30-
name: {{ include "aibrix.serviceAccountName" . }}-gpu-optimizer
32+
name: {{ include "aibrix.gpuOptimizer.serviceAccountName" . }}
3133
namespace: {{ .Release.Namespace }}
3234
roleRef:
3335
kind: ClusterRole

‎dist/chart/templates/metadata-service/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
app.kubernetes.io/component: aibrix-metadata-service
1919
spec:
2020
{{- include "aibrix.imagePullSecrets" (dict "componentSecrets" .Values.metadata.service.imagePullSecrets "globalSecrets" .Values.global.imagePullSecrets) | nindent 6 }}
21-
serviceAccountName: {{ include "aibrix.serviceAccountName" . }}-metadata-service
21+
serviceAccountName: {{ include "aibrix.metadata.serviceAccountName" . }}
2222
initContainers:
2323
- name: init-redis
2424
image: {{ .Values.metadata.service.initContainer.image.repository }}:{{ .Values.metadata.service.initContainer.image.tag }}

‎dist/chart/templates/metadata-service/rbac.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
apiVersion: v1
22
kind: ServiceAccount
33
metadata:
4+
name: {{ include "aibrix.metadata.serviceAccountName" . }}
5+
annotations:
6+
{{- toYaml .Values.metadata.serviceAccount.annotations | nindent 4 }}
47
labels:
58
{{- include "aibrix.labels" . | nindent 4 }}
69
app.kubernetes.io/component: aibrix-metadata-service
7-
name: {{ include "aibrix.serviceAccountName" . }}-metadata-service
810
---
911

1012
apiVersion: rbac.authorization.k8s.io/v1
@@ -52,5 +54,5 @@ roleRef:
5254
name: {{ include "aibrix.fullname" . }}-metadata-service-reader
5355
subjects:
5456
- kind: ServiceAccount
55-
name: {{ include "aibrix.serviceAccountName" . }}-metadata-service
57+
name: {{ include "aibrix.metadata.serviceAccountName" . }}
5658
namespace: {{ .Release.Namespace }}

0 commit comments

Comments
 (0)