Skip to content
This repository was archived by the owner on Jun 22, 2024. It is now read-only.

Commit 3be1d42

Browse files
OpvolgerVietND96
Opvolger
and
VietND96
authored
feat(chart): templating in name(Override) (SeleniumHQ#2107)
Co-authored-by: Viet Nguyen Duc <[email protected]> [skip ci]
1 parent 84ac1f8 commit 3be1d42

13 files changed

+40
-40
lines changed

‎charts/selenium-grid/templates/_helpers.tpl‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -43,70 +43,70 @@ helm.sh/chart: {{ include "seleniumGrid.chart" . }}
4343
Selenium Hub fullname
4444
*/}}
4545
{{- define "seleniumGrid.hub.fullname" -}}
46-
{{- default "selenium-hub" .Values.hub.nameOverride | trunc 63 | trimSuffix "-" -}}
46+
{{- tpl (default "selenium-hub" .Values.hub.nameOverride) $ | trunc 63 | trimSuffix "-" -}}
4747
{{- end -}}
4848

4949
{{/*
5050
Event bus fullname
5151
*/}}
5252
{{- define "seleniumGrid.eventBus.fullname" -}}
53-
{{- default "selenium-event-bus" .Values.components.eventBus.nameOverride | trunc 63 | trimSuffix "-" -}}
53+
{{- tpl (default "selenium-event-bus" .Values.components.eventBus.nameOverride) $ | trunc 63 | trimSuffix "-" -}}
5454
{{- end -}}
5555

5656
{{/*
5757
Router fullname
5858
*/}}
5959
{{- define "seleniumGrid.router.fullname" -}}
60-
{{- default "selenium-router" .Values.components.router.nameOverride | trunc 63 | trimSuffix "-" -}}
60+
{{- tpl (default "selenium-router" .Values.components.router.nameOverride) $ | trunc 63 | trimSuffix "-" -}}
6161
{{- end -}}
6262

6363
{{/*
6464
Distributor fullname
6565
*/}}
6666
{{- define "seleniumGrid.distributor.fullname" -}}
67-
{{- default "selenium-distributor" .Values.components.distributor.nameOverride | trunc 63 | trimSuffix "-" -}}
67+
{{- tpl (default "selenium-distributor" .Values.components.distributor.nameOverride) $ | trunc 63 | trimSuffix "-" -}}
6868
{{- end -}}
6969

7070
{{/*
7171
SessionMap fullname
7272
*/}}
7373
{{- define "seleniumGrid.sessionMap.fullname" -}}
74-
{{- default "selenium-session-map" .Values.components.sessionMap.nameOverride | trunc 63 | trimSuffix "-" -}}
74+
{{- tpl (default "selenium-session-map" .Values.components.sessionMap.nameOverride) $ | trunc 63 | trimSuffix "-" -}}
7575
{{- end -}}
7676

7777
{{/*
7878
SessionQueue fullname
7979
*/}}
8080
{{- define "seleniumGrid.sessionQueue.fullname" -}}
81-
{{- default "selenium-session-queue" .Values.components.sessionQueue.nameOverride | trunc 63 | trimSuffix "-" -}}
81+
{{- tpl (default "selenium-session-queue" .Values.components.sessionQueue.nameOverride) $ | trunc 63 | trimSuffix "-" -}}
8282
{{- end -}}
8383

8484
{{/*
8585
Chrome node fullname
8686
*/}}
8787
{{- define "seleniumGrid.chromeNode.fullname" -}}
88-
{{- default "selenium-chrome-node" .Values.chromeNode.nameOverride | trunc 63 | trimSuffix "-" -}}
88+
{{- tpl (default "selenium-chrome-node" .Values.chromeNode.nameOverride) $ | trunc 63 | trimSuffix "-" -}}
8989
{{- end -}}
9090

9191
{{/*
9292
Firefox node fullname
9393
*/}}
9494
{{- define "seleniumGrid.firefoxNode.fullname" -}}
95-
{{- default "selenium-firefox-node" .Values.firefoxNode.nameOverride | trunc 63 | trimSuffix "-" -}}
95+
{{- tpl (default "selenium-firefox-node" .Values.firefoxNode.nameOverride) $ | trunc 63 | trimSuffix "-" -}}
9696
{{- end -}}
9797

9898
{{/*
9999
Edge node fullname
100100
*/}}
101101
{{- define "seleniumGrid.edgeNode.fullname" -}}
102-
{{- default "selenium-edge-node" .Values.edgeNode.nameOverride | trunc 63 | trimSuffix "-" -}}
102+
{{- tpl (default "selenium-edge-node" .Values.edgeNode.nameOverride) $ | trunc 63 | trimSuffix "-" -}}
103103
{{- end -}}
104104

105105
{{/*
106106
Ingress fullname
107107
*/}}
108108
{{- define "seleniumGrid.ingress.fullname" -}}
109-
{{- default "selenium-ingress" .Values.ingress.nameOverride | trunc 63 | trimSuffix "-" -}}
109+
{{- tpl (default "selenium-ingress" .Values.ingress.nameOverride) $ | trunc 63 | trimSuffix "-" -}}
110110
{{- end -}}
111111

112112
{{/*
@@ -170,7 +170,7 @@ Get probe settings
170170
Secret TLS fullname
171171
*/}}
172172
{{- define "seleniumGrid.tls.fullname" -}}
173-
{{- default "selenium-tls-secret" .Values.tls.nameOverride | trunc 63 | trimSuffix "-" -}}
173+
{{- ( tpl (default "selenium-tls-secret" .Values.tls.nameOverride) $ )| trunc 63 | trimSuffix "-" -}}
174174
{{- end -}}
175175

176176
{{/*
@@ -197,7 +197,7 @@ Get default certificate file name in chart
197197
Common secrets cross components
198198
*/}}
199199
{{- define "seleniumGrid.common.secrets" -}}
200-
{{- default "selenium-secrets" .Values.secrets.nameOverride | trunc 63 | trimSuffix "-" -}}
200+
{{- tpl (default "selenium-secrets" .Values.secrets.nameOverride) $ | trunc 63 | trimSuffix "-" -}}
201201
{{- end -}}
202202

203203
{{- define "seleniumGrid.ingress.nginx.annotations.default" -}}
@@ -231,14 +231,14 @@ nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
231231
Service Account fullname
232232
*/}}
233233
{{- define "seleniumGrid.serviceAccount.fullname" -}}
234-
{{- .Values.serviceAccount.name | default "selenium-serviceaccount" | trunc 63 | trimSuffix "-" -}}
234+
{{- tpl (.Values.serviceAccount.name | default "selenium-serviceaccount") $ | trunc 63 | trimSuffix "-" -}}
235235
{{- end -}}
236236

237237
{{/*
238238
Video ConfigMap fullname
239239
*/}}
240240
{{- define "seleniumGrid.video.fullname" -}}
241-
{{- default "selenium-video" .Values.videoRecorder.nameOverride | trunc 63 | trimSuffix "-" -}}
241+
{{- tpl (default "selenium-video" .Values.videoRecorder.nameOverride) $ | trunc 63 | trimSuffix "-" -}}
242242
{{- end -}}
243243

244244
{{/*
@@ -547,7 +547,7 @@ template:
547547
volumes:
548548
- name: {{ .Values.nodeConfigMap.scriptVolumeMountName }}
549549
configMap:
550-
name: {{ .Values.nodeConfigMap.name }}
550+
name: {{ tpl .Values.nodeConfigMap.name $ }}
551551
defaultMode: {{ .Values.nodeConfigMap.defaultMode }}
552552
- name: dshm
553553
emptyDir:
@@ -599,8 +599,8 @@ Get the url of the grid. If the external url can be figured out from the ingress
599599
{{- if .Values.ingress.enabled -}}
600600
{{- if and (not .Values.ingress.hostname) .Values.global.K8S_PUBLIC_IP -}}
601601
{{- $host = .Values.global.K8S_PUBLIC_IP -}}
602-
{{- else if and .Values.ingress.hostname (ne .Values.ingress.hostname "selenium-grid.local") -}}
603-
{{- $host = .Values.ingress.hostname -}}
602+
{{- else if and .Values.ingress.hostname (ne (tpl .Values.ingress.hostname $) "selenium-grid.local") -}}
603+
{{- $host = (tpl .Values.ingress.hostname $) -}}
604604
{{- end -}}
605605
{{- else if .Values.global.K8S_PUBLIC_IP -}}
606606
{{- $host = .Values.global.K8S_PUBLIC_IP -}}

‎charts/selenium-grid/templates/distributor-deployment.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ spec:
4646
{{- end }}
4747
envFrom:
4848
- configMapRef:
49-
name: {{ .Values.busConfigMap.name }}
49+
name: {{ tpl .Values.busConfigMap.name $ }}
5050
- configMapRef:
51-
name: {{ .Values.loggingConfigMap.name }}
51+
name: {{ tpl .Values.loggingConfigMap.name $ }}
5252
- configMapRef:
53-
name: {{ .Values.serverConfigMap.name }}
53+
name: {{ tpl .Values.serverConfigMap.name $ }}
5454
- secretRef:
5555
name: {{ include "seleniumGrid.common.secrets" $ | quote }}
5656
{{- with .Values.components.extraEnvFrom }}

‎charts/selenium-grid/templates/event-bus-configmap.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
apiVersion: v1
55
kind: ConfigMap
66
metadata:
7-
name: {{ .Values.busConfigMap.name }}
7+
name: {{ tpl .Values.busConfigMap.name $ }}
88
namespace: {{ .Release.Namespace }}
99
{{- with .Values.busConfigMap.annotations }}
1010
annotations: {{- toYaml . | nindent 4 }}

‎charts/selenium-grid/templates/event-bus-deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ spec:
4444
{{- end }}
4545
envFrom:
4646
- configMapRef:
47-
name: {{ .Values.loggingConfigMap.name }}
47+
name: {{ tpl .Values.loggingConfigMap.name $ }}
4848
- configMapRef:
49-
name: {{ .Values.serverConfigMap.name }}
49+
name: {{ tpl .Values.serverConfigMap.name $ }}
5050
- secretRef:
5151
name: {{ include "seleniumGrid.common.secrets" $ | quote }}
5252
{{- with .Values.components.extraEnvFrom }}

‎charts/selenium-grid/templates/hub-deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ spec:
104104
{{- end }}
105105
envFrom:
106106
- configMapRef:
107-
name: {{ .Values.loggingConfigMap.name }}
107+
name: {{ tpl .Values.loggingConfigMap.name $ }}
108108
- configMapRef:
109-
name: {{ .Values.serverConfigMap.name }}
109+
name: {{ tpl .Values.serverConfigMap.name $ }}
110110
- secretRef:
111111
name: {{ include "seleniumGrid.common.secrets" $ | quote }}
112112
{{- with .Values.hub.extraEnvFrom }}

‎charts/selenium-grid/templates/ingress.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,24 @@ spec:
3232
{{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
3333
ingressClassName: {{ .Values.ingress.className }}
3434
{{- end }}
35-
{{- if and (or .Values.tls.enabled .Values.tls.ingress.generateTLS) .Values.ingress.hostname (not .Values.ingress.tls) }}
35+
{{- if and (or .Values.tls.enabled .Values.tls.ingress.generateTLS) (tpl .Values.ingress.hostname $) (not .Values.ingress.tls) }}
3636
tls:
3737
- hosts:
38-
- {{ .Values.ingress.hostname | quote }}
38+
- {{ tpl .Values.ingress.hostname $ | quote }}
3939
secretName: {{ include "seleniumGrid.tls.fullname" . | quote }}
4040
{{- else if .Values.ingress.tls }}
4141
tls:
4242
{{- range .Values.ingress.tls }}
4343
- hosts:
4444
{{- range .hosts }}
45-
- {{ . | quote }}
45+
- {{ tpl . $ | quote }}
4646
{{- end }}
4747
secretName: {{ tpl (.secretName) $ | quote }}
4848
{{- end }}
4949
{{- end }}
5050
rules:
5151
{{- if $.Values.ingress.hostname }}
52-
- host: {{ .Values.ingress.hostname }}
52+
- host: {{ tpl $.Values.ingress.hostname $ }}
5353
http:
5454
{{- else }}
5555
- http:

‎charts/selenium-grid/templates/logging-configmap.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
kind: ConfigMap
33
metadata:
4-
name: {{ .Values.loggingConfigMap.name }}
4+
name: {{ tpl .Values.loggingConfigMap.name $ }}
55
namespace: {{ .Release.Namespace }}
66
{{- with .Values.loggingConfigMap.annotations }}
77
annotations: {{- toYaml . | nindent 4 }}

‎charts/selenium-grid/templates/node-configmap.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
kind: ConfigMap
33
metadata:
4-
name: {{ .Values.nodeConfigMap.name }}
4+
name: {{ tpl .Values.nodeConfigMap.name $ }}
55
namespace: {{ .Release.Namespace }}
66
{{- with .Values.nodeConfigMap.annotations }}
77
annotations: {{- toYaml . | nindent 4 }}

‎charts/selenium-grid/templates/router-deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ spec:
5858
{{- end }}
5959
envFrom:
6060
- configMapRef:
61-
name: {{ .Values.loggingConfigMap.name }}
61+
name: {{ tpl .Values.loggingConfigMap.name $ }}
6262
- configMapRef:
63-
name: {{ .Values.serverConfigMap.name }}
63+
name: {{ tpl .Values.serverConfigMap.name $ }}
6464
- secretRef:
6565
name: {{ include "seleniumGrid.common.secrets" $ | quote }}
6666
{{- with .Values.components.extraEnvFrom }}

‎charts/selenium-grid/templates/server-configmap.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
kind: ConfigMap
33
metadata:
4-
name: {{ .Values.serverConfigMap.name }}
4+
name: {{ tpl .Values.serverConfigMap.name $ }}
55
namespace: {{ .Release.Namespace }}
66
{{- with .Values.busConfigMap.annotations }}
77
annotations: {{- toYaml . | nindent 4 }}

0 commit comments

Comments
 (0)