Skip to content

Commit e36cc59

Browse files
zmconnellyzmconnelly
authored
Helm: ability to specify image pull secrets (#1619) (#1620)
* Helm: ability to specify image pull secrets (#1619) Added global value `global.seleniumGrid.imagePullSecret` Added per component override `component.imagePullSecret` Updated readme Bumped chart version to 0.7.0 * Helm: ability to specify image pull secrets (#1619) Added global value `global.seleniumGrid.imagePullSecret` Added per component override `component.imagePullSecret` Updated readme Bumped chart version to 0.7.0
1 parent e35f3aa commit e36cc59

13 files changed

+86
-6
lines changed

‎charts/selenium-grid/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
All notable changes to this helm chart will be documented in this file.
44

5+
## :heavy_check_mark: 0.7.0
6+
7+
### Added
8+
- Added ability to specify image pull secrets
9+
510
## :heavy_check_mark: 0.6.2
611

712
### Added

‎charts/selenium-grid/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ apiVersion: v2
22
name: selenium-grid
33
description: A Helm chart for creating a Selenium Grid Server in Kubernetes
44
type: application
5-
version: 0.6.2
5+
version: 0.7.0
66
appVersion: 4.3.0-20220628
77
icon: https://github.com/SeleniumHQ/docker-selenium/raw/trunk/logo.png

‎charts/selenium-grid/README.md

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,11 @@ helm uninstall selenium-grid
4949

5050
For now, global configuration supported is:
5151

52-
| Parameter | Default | Description |
53-
| ----------------------------------- | ---------------------------------- | ------------------------------------- |
54-
| `global.seleniumGrid.imageTag` | `4.3.0-20220628` | Image tag for all selenium components |
55-
| `global.seleniumGrid.nodesImageTag` | `4.3.0-20220628` | Image tag for browser's nodes |
52+
| Parameter | Default | Description |
53+
| ----------------------------------- | ---------------------------------- | ------------------------------------- |
54+
| `global.seleniumGrid.imageTag` | `4.3.0-20220628` | Image tag for all selenium components |
55+
| `global.seleniumGrid.nodesImageTag` | `4.3.0-20220628` | Image tag for browser's nodes |
56+
| `global.seleniumGrid.imagePullSecret` | `""` | Pull secret to be used for all images |
5657

5758
This table contains the configuration parameters of the chart and their default values:
5859

@@ -71,6 +72,7 @@ This table contains the configuration parameters of the chart and their default
7172
| `chromeNode.imageName` | `selenium/node-chrome` | Image of chrome nodes |
7273
| `chromeNode.imageTag` | `4.3.0-20220628` | Image of chrome nodes |
7374
| `chromeNode.imagePullPolicy` | `IfNotPresent` | Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images) |
75+
| `chromeNode.imagePullSecret` | `""` | Image pull secret (see https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry) |
7476
| `chromeNode.ports` | `[5553]` | Port list to enable on container |
7577
| `chromeNode.seleniumPort` | `5900` | Selenium port (spec.ports[0].targetPort in kubernetes service) |
7678
| `chromeNode.seleniumServicePort` | `6900` | Selenium port exposed in service (spec.ports[0].port in kubernetes service) |
@@ -94,6 +96,7 @@ This table contains the configuration parameters of the chart and their default
9496
| `firefoxNode.imageName` | `selenium/node-firefox` | Image of firefox nodes |
9597
| `firefoxNode.imageTag` | `4.3.0-20220628` | Image of firefox nodes |
9698
| `firefoxNode.imagePullPolicy` | `IfNotPresent` | Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images) |
99+
| `firefoxNode.imagePullSecret` | `""` | Image pull secret (see https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry) |
97100
| `firefoxNode.ports` | `[5553]` | Port list to enable on container |
98101
| `firefoxNode.seleniumPort` | `5900` | Selenium port (spec.ports[0].targetPort in kubernetes service) |
99102
| `firefoxNode.seleniumServicePort` | `6900` | Selenium port exposed in service (spec.ports[0].port in kubernetes service) |
@@ -117,6 +120,7 @@ This table contains the configuration parameters of the chart and their default
117120
| `edgeNode.imageName` | `selenium/node-edge` | Image of edge nodes |
118121
| `edgeNode.imageTag` | `4.3.0-20220628` | Image of edge nodes |
119122
| `edgeNode.imagePullPolicy` | `IfNotPresent` | Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images) |
123+
| `edgeNode.imagePullSecret` | `""` | Image pull secret (see https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry) |
120124
| `edgeNode.ports` | `[5553]` | Port list to enable on container |
121125
| `edgeNode.seleniumPort` | `5900` | Selenium port (spec.ports[0].targetPort in kubernetes service) |
122126
| `edgeNode.seleniumServicePort` | `6900` | Selenium port exposed in service (spec.ports[0].port in kubernetes service) |
@@ -147,6 +151,7 @@ You can configure the Selenium Hub with this values:
147151
| `hub.imageName` | `selenium/hub` | Selenium Hub image name |
148152
| `hub.imageTag` | `nil` | Selenium Hub image tag (this overwrites `.global.seleniumGrid.imageTag` value) |
149153
| `hub.imagePullPolicy` | `IfNotPresent` | Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images) |
154+
| `hub.imagePullSecret` | `""` | Image pull secret (see https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry) |
150155
| `hub.annotations` | `{}` | Custom annotations for Selenium Hub pod |
151156
| `hub.labels` | `{}` | Custom labels for Selenium Hub pod |
152157
| `hub.publishPort` | `4442` | Port where events are published |
@@ -173,6 +178,7 @@ If you implement selenium-grid with separate components (`isolateComponents: tru
173178
| `components.router.imageName` | `selenium/router` | Router image name |
174179
| `components.router.imageTag` | `nil` | Router image tag (this overwrites `.global.seleniumGrid.imageTag` value) |
175180
| `components.router.imagePullPolicy` | `IfNotPresent` | Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images) |
181+
| `components.router.imagePullSecret` | `""` | Image pull secret (see https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry) |
176182
| `components.router.annotations` | `{}` | Custom annotations for router pod |
177183
| `components.router.port` | `4444` | Router port |
178184
| `components.router.livenessProbe` | `See values.yaml` | Liveness probe settings |
@@ -186,6 +192,7 @@ If you implement selenium-grid with separate components (`isolateComponents: tru
186192
| `components.distributor.imageName` | `selenium/distributor` | Distributor image name |
187193
| `components.distributor.imageTag` | `nil` | Distributor image tag (this overwrites `.global.seleniumGrid.imageTag` value) |
188194
| `components.distributor.imagePullPolicy` | `IfNotPresent` | Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images) |
195+
| `components.distributor.imagePullSecret` | `""` | Image pull secret (see https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry) |
189196
| `components.distributor.annotations` | `{}` | Custom annotations for Distributor pod |
190197
| `components.distributor.port` | `5553` | Distributor port |
191198
| `components.distributor.resources` | `{}` | Resources for Distributor container |
@@ -197,6 +204,7 @@ If you implement selenium-grid with separate components (`isolateComponents: tru
197204
| `components.eventBus.imageName` | `selenium/event-bus` | Event Bus image name |
198205
| `components.eventBus.imageTag` | `nil` | Event Bus image tag (this overwrites `.global.seleniumGrid.imageTag` value) |
199206
| `components.eventBus.imagePullPolicy` | `IfNotPresent` | Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images) |
207+
| `components.eventBus.imagePullSecret` | `""` | Image pull secret (see https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry) |
200208
| `components.eventBus.annotations` | `{}` | Custom annotations for Event Bus pod |
201209
| `components.eventBus.port` | `5557` | Event Bus port |
202210
| `components.eventBus.publishPort` | `4442` | Port where events are published |
@@ -210,6 +218,7 @@ If you implement selenium-grid with separate components (`isolateComponents: tru
210218
| `components.sessionMap.imageName` | `selenium/sessions` | Session Map image name |
211219
| `components.sessionMap.imageTag` | `nil` | Session Map image tag (this overwrites `.global.seleniumGrid.imageTag` value) |
212220
| `components.sessionMap.imagePullPolicy` | `IfNotPresent` | Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images) |
221+
| `components.sessionMap.imagePullSecret` | `""` | Image pull secret (see https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry) |
213222
| `components.sessionMap.annotations` | `{}` | Custom annotations for Session Map pod |
214223
| `components.sessionMap.resources` | `{}` | Resources for event-bus container |
215224
| `components.sessionMap.serviceType` | `ClusterIP` | Kubernetes service type (see https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) |
@@ -220,6 +229,7 @@ If you implement selenium-grid with separate components (`isolateComponents: tru
220229
| `components.sessionQueue.imageName` | `selenium/session-queue` | Session Queue image name |
221230
| `components.sessionQueue.imageTag` | `nil` | Session Queue image tag (this overwrites `.global.seleniumGrid.imageTag` value) |
222231
| `components.sessionQueue.imagePullPolicy` | `IfNotPresent` | Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images) |
232+
| `components.sessionQueue.imagePullSecret` | `""` | Image pull secret (see https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry) |
223233
| `components.sessionQueue.annotations` | `{}` | Custom annotations for Session Queue pod |
224234
| `components.sessionQueue.resources` | `{}` | Resources for event-bus container |
225235
| `components.sessionQueue.serviceType` | `ClusterIP` | Kubernetes service type (see https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) |

‎charts/selenium-grid/templates/chrome-node-deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ spec:
6161
{{- with .Values.chromeNode.resources }}
6262
resources: {{- toYaml . | nindent 12 }}
6363
{{- end }}
64+
{{- if or .Values.global.seleniumGrid.imagePullSecret .Values.chromeNode.imagePullSecret }}
65+
imagePullSecrets:
66+
- name: {{ default .Values.global.seleniumGrid.imagePullSecret .Values.chromeNode.imagePullSecret }}
67+
{{- end }}
6468
{{- with .Values.chromeNode.nodeSelector }}
6569
nodeSelector: {{- toYaml . | nindent 8 }}
6670
{{- end }}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ spec:
5252
{{- with .Values.components.distributor.resources }}
5353
resources: {{- toYaml . | nindent 12 }}
5454
{{- end }}
55+
{{- if or .Values.global.seleniumGrid.imagePullSecret .Values.components.distributor.imagePullSecret }}
56+
imagePullSecrets:
57+
- name: {{ default .Values.global.seleniumGrid.imagePullSecret .Values.components.distributor.imagePullSecret }}
58+
{{- end }}
5559
{{- with .Values.components.distributor.nodeSelector }}
5660
nodeSelector: {{- toYaml . | nindent 8 }}
5761
{{- end }}

‎charts/selenium-grid/templates/edge-node-deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ spec:
6868
tolerations:
6969
{{ toYaml . | nindent 6 }}
7070
{{- end }}
71+
{{- if or .Values.global.seleniumGrid.imagePullSecret .Values.edgeNode.imagePullSecret }}
72+
imagePullSecrets:
73+
- name: {{ default .Values.global.seleniumGrid.imagePullSecret .Values.edgeNode.imagePullSecret }}
74+
{{- end }}
7175
{{- with .Values.edgeNode.priorityClassName }}
7276
priorityClassName: {{ . }}
7377
{{- end }}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ spec:
5252
tolerations:
5353
{{ toYaml . | nindent 6 }}
5454
{{- end }}
55+
{{- if or .Values.global.seleniumGrid.imagePullSecret .Values.components.eventBus.imagePullSecret }}
56+
imagePullSecrets:
57+
- name: {{ default .Values.global.seleniumGrid.imagePullSecret .Values.components.eventBus.imagePullSecret }}
58+
{{- end }}
5559
{{- with .Values.components.eventBus.priorityClassName }}
5660
priorityClassName: {{ . }}
5761
{{- end }}

‎charts/selenium-grid/templates/firefox-node-deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ spec:
6868
tolerations:
6969
{{ toYaml . | nindent 6 }}
7070
{{- end }}
71+
{{- if or .Values.global.seleniumGrid.imagePullSecret .Values.firefoxNode.imagePullSecret }}
72+
imagePullSecrets:
73+
- name: {{ default .Values.global.seleniumGrid.imagePullSecret .Values.firefoxNode.imagePullSecret }}
74+
{{- end }}
7175
{{- with .Values.firefoxNode.priorityClassName }}
7276
priorityClassName: {{ . }}
7377
{{- end }}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ spec:
7777
tolerations:
7878
{{ toYaml . | nindent 6 }}
7979
{{- end }}
80+
{{- if or .Values.global.seleniumGrid.imagePullSecret .Values.hub.imagePullSecret }}
81+
imagePullSecrets:
82+
- name: {{ default .Values.global.seleniumGrid.imagePullSecret .Values.hub.imagePullSecret }}
83+
{{- end }}
8084
{{- with .Values.hub.priorityClassName }}
8185
priorityClassName: {{ . }}
8286
{{- end }}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ spec:
8383
tolerations:
8484
{{ toYaml . | nindent 6 }}
8585
{{- end }}
86+
{{- if or .Values.global.seleniumGrid.imagePullSecret .Values.components.router.imagePullSecret }}
87+
imagePullSecrets:
88+
- name: {{ default .Values.global.seleniumGrid.imagePullSecret .Values.components.router.imagePullSecret }}
89+
{{- end }}
8690
{{- with .Values.components.router.priorityClassName }}
8791
priorityClassName: {{ . }}
8892
{{- end }}

‎charts/selenium-grid/templates/session-map-deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ spec:
5050
tolerations:
5151
{{ toYaml . | nindent 6 }}
5252
{{- end }}
53+
{{- if or .Values.global.seleniumGrid.imagePullSecret .Values.components.sessionMap.imagePullSecret }}
54+
imagePullSecrets:
55+
- name: {{ default .Values.global.seleniumGrid.imagePullSecret .Values.components.sessionMap.imagePullSecret }}
56+
{{- end }}
5357
{{- with .Values.components.sessionMap.priorityClassName }}
5458
priorityClassName: {{ . }}
5559
{{- end }}

‎charts/selenium-grid/templates/session-queuer-deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ spec:
5050
tolerations:
5151
{{ toYaml . | nindent 6 }}
5252
{{- end }}
53+
{{- if or .Values.global.seleniumGrid.imagePullSecret .Values.components.sessionQueue.imagePullSecret }}
54+
imagePullSecrets:
55+
- name: {{ default .Values.global.seleniumGrid.imagePullSecret .Values.components.sessionQueue.imagePullSecret }}
56+
{{- end }}
5357
{{- with .Values.components.sessionQueue.priorityClassName }}
5458
priorityClassName: {{ . }}
5559
{{- end }}

0 commit comments

Comments
 (0)