Skip to content

chart(fix): ensure images are pre-pulled and started together in Node #2387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 9, 2024
Merged

chart(fix): ensure images are pre-pulled and started together in Node #2387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions charts/selenium-grid/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,10 @@ Component update strategy template
Common pod template
*/}}
{{- define "seleniumGrid.podTemplate" -}}
{{- $nodeImageRegistry := default $.Values.global.seleniumGrid.imageRegistry .node.imageRegistry -}}
{{- $nodeImageTag := default $.Values.global.seleniumGrid.nodesImageTag .node.imageTag -}}
{{- $videoImageRegistry := default $.Values.global.seleniumGrid.imageRegistry $.Values.videoRecorder.imageRegistry -}}
{{- $videoImageTag := default $.Values.global.seleniumGrid.videoImageTag $.Values.videoRecorder.imageTag -}}
template:
metadata:
labels:
Expand Down Expand Up @@ -298,15 +302,21 @@ template:
{{- with .node.hostAliases }}
hostAliases: {{ toYaml . | nindent 6 }}
{{- end }}
{{- with .node.initContainers }}
initContainers:
- name: "pre-puller-{{ .name }}"
image: {{ printf "%s/%s:%s" $nodeImageRegistry .node.imageName $nodeImageTag }}
command: ["bash", "-c", "'true'"]
{{- if $.Values.videoRecorder.enabled }}
- name: "pre-puller-{{ $.Values.videoRecorder.name }}"
image: {{ printf "%s/%s:%s" $videoImageRegistry $.Values.videoRecorder.imageName $videoImageTag }}
command: ["bash", "-c", "'true'"]
{{- end }}
{{- with .node.initContainers }}
{{- toYaml . | nindent 6 }}
{{- end }}
{{- end }}
containers:
- name: {{ .name }}
{{- $imageTag := default $.Values.global.seleniumGrid.nodesImageTag .node.imageTag }}
{{- $imageRegistry := default $.Values.global.seleniumGrid.imageRegistry .node.imageRegistry }}
image: {{ printf "%s/%s:%s" $imageRegistry .node.imageName $imageTag }}
image: {{ printf "%s/%s:%s" $nodeImageRegistry .node.imageName $nodeImageTag }}
imagePullPolicy: {{ .node.imagePullPolicy }}
env:
- name: SE_NODE_CONTAINER_NAME
Expand Down Expand Up @@ -444,9 +454,7 @@ template:
{{- end }}
{{- if $.Values.videoRecorder.enabled }}
- name: {{ $.Values.videoRecorder.name }}
{{- $imageTag := default $.Values.global.seleniumGrid.videoImageTag $.Values.videoRecorder.imageTag }}
{{- $imageRegistry := default $.Values.global.seleniumGrid.imageRegistry $.Values.videoRecorder.imageRegistry }}
image: {{ printf "%s/%s:%s" $imageRegistry $.Values.videoRecorder.imageName $imageTag }}
image: {{ printf "%s/%s:%s" $videoImageRegistry $.Values.videoRecorder.imageName $videoImageTag }}
imagePullPolicy: {{ $.Values.videoRecorder.imagePullPolicy }}
env:
- name: SE_NODE_PORT
Expand Down
1 change: 1 addition & 0 deletions tests/charts/templates/render/dummy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ autoscaling:
scalingType: deployment

basicAuth:
enabled: true
username: sysadmin
password: strongPassword

Expand Down
1 change: 1 addition & 0 deletions tests/charts/templates/render/dummy_solution.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ selenium-grid:
scalingType: deployment

basicAuth:
enabled: true
username: sysadmin
password: strongPassword

Expand Down
Loading