Skip to content

Commit 44d9224

Browse files
authored
chart(fix): ensure images are pre-pulled and started together in Node (#2387)
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 5f42b30 commit 44d9224

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

Diff for: charts/selenium-grid/templates/_helpers.tpl

+16-8
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,10 @@ Component update strategy template
270270
Common pod template
271271
*/}}
272272
{{- define "seleniumGrid.podTemplate" -}}
273+
{{- $nodeImageRegistry := default $.Values.global.seleniumGrid.imageRegistry .node.imageRegistry -}}
274+
{{- $nodeImageTag := default $.Values.global.seleniumGrid.nodesImageTag .node.imageTag -}}
275+
{{- $videoImageRegistry := default $.Values.global.seleniumGrid.imageRegistry $.Values.videoRecorder.imageRegistry -}}
276+
{{- $videoImageTag := default $.Values.global.seleniumGrid.videoImageTag $.Values.videoRecorder.imageTag -}}
273277
template:
274278
metadata:
275279
labels:
@@ -298,15 +302,21 @@ template:
298302
{{- with .node.hostAliases }}
299303
hostAliases: {{ toYaml . | nindent 6 }}
300304
{{- end }}
301-
{{- with .node.initContainers }}
302305
initContainers:
306+
- name: "pre-puller-{{ .name }}"
307+
image: {{ printf "%s/%s:%s" $nodeImageRegistry .node.imageName $nodeImageTag }}
308+
command: ["bash", "-c", "'true'"]
309+
{{- if $.Values.videoRecorder.enabled }}
310+
- name: "pre-puller-{{ $.Values.videoRecorder.name }}"
311+
image: {{ printf "%s/%s:%s" $videoImageRegistry $.Values.videoRecorder.imageName $videoImageTag }}
312+
command: ["bash", "-c", "'true'"]
313+
{{- end }}
314+
{{- with .node.initContainers }}
303315
{{- toYaml . | nindent 6 }}
304-
{{- end }}
316+
{{- end }}
305317
containers:
306318
- name: {{ .name }}
307-
{{- $imageTag := default $.Values.global.seleniumGrid.nodesImageTag .node.imageTag }}
308-
{{- $imageRegistry := default $.Values.global.seleniumGrid.imageRegistry .node.imageRegistry }}
309-
image: {{ printf "%s/%s:%s" $imageRegistry .node.imageName $imageTag }}
319+
image: {{ printf "%s/%s:%s" $nodeImageRegistry .node.imageName $nodeImageTag }}
310320
imagePullPolicy: {{ .node.imagePullPolicy }}
311321
env:
312322
- name: SE_NODE_CONTAINER_NAME
@@ -444,9 +454,7 @@ template:
444454
{{- end }}
445455
{{- if $.Values.videoRecorder.enabled }}
446456
- name: {{ $.Values.videoRecorder.name }}
447-
{{- $imageTag := default $.Values.global.seleniumGrid.videoImageTag $.Values.videoRecorder.imageTag }}
448-
{{- $imageRegistry := default $.Values.global.seleniumGrid.imageRegistry $.Values.videoRecorder.imageRegistry }}
449-
image: {{ printf "%s/%s:%s" $imageRegistry $.Values.videoRecorder.imageName $imageTag }}
457+
image: {{ printf "%s/%s:%s" $videoImageRegistry $.Values.videoRecorder.imageName $videoImageTag }}
450458
imagePullPolicy: {{ $.Values.videoRecorder.imagePullPolicy }}
451459
env:
452460
- name: SE_NODE_PORT

Diff for: tests/charts/templates/render/dummy.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ autoscaling:
2323
scalingType: deployment
2424

2525
basicAuth:
26+
enabled: true
2627
username: sysadmin
2728
password: strongPassword
2829

Diff for: tests/charts/templates/render/dummy_solution.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ selenium-grid:
2424
scalingType: deployment
2525

2626
basicAuth:
27+
enabled: true
2728
username: sysadmin
2829
password: strongPassword
2930

0 commit comments

Comments
 (0)