Skip to content

Commit c34766e

Browse files
VietND96VietND96
authored
Merge branch 'trunk' into renovate/ubuntu-update
2 parents 2c0c8f9 + 312af17 commit c34766e

11 files changed

Lines changed: 130 additions & 2 deletions

‎charts/selenium-grid/CONFIGURATION.md‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
2222
| https://charts.bitnami.com/bitnami | redis | ^25.0.0 |
2323
| https://jaegertracing.github.io/helm-charts | jaeger | ^4.0.0 |
2424
| https://kedacore.github.io/charts | keda | 2.19 |
25-
| https://prometheus-community.github.io/helm-charts | kube-prometheus-stack | ^83.0.0 |
25+
| https://prometheus-community.github.io/helm-charts | kube-prometheus-stack | ^84.0.0 |
2626
| https://traefik.github.io/charts | traefik | ^39.0.0 |
2727

2828
## Values
@@ -49,6 +49,8 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
4949
| global.seleniumGrid.updateStrategy.type | string | `"Recreate"` | Specify update strategy for all components, can be overridden individually |
5050
| global.seleniumGrid.updateStrategy.rollingUpdate | object | `{"maxSurge":1,"maxUnavailable":0}` | Specify for strategy RollingUpdate |
5151
| global.seleniumGrid.affinity | object | `{}` | Specify affinity for all components, can be overridden individually |
52+
| global.seleniumGrid.dnsPolicy | string | `""` | Specify dnsPolicy for all components, can be overridden individually |
53+
| global.seleniumGrid.dnsConfig | object | `{}` | Specify dnsConfig for all components, can be overridden individually |
5254
| global.seleniumGrid.topologySpreadConstraints | list | `[]` | Specify topologySpreadConstraints for all components, can be overridden individually |
5355
| global.seleniumGrid.sessionRequestTimeout | int | `300` | Timeout in seconds. A new incoming session request is added to the queue. Requests sitting in the queue for longer than the configured time will timeout. |
5456
| global.seleniumGrid.nodeMaxSessions | int | `1` | Specify number of max sessions per node. Can be overridden by individual component (this is also set to scaler trigger parameter `nodeMaxSessions` if `autoscaling` is enabled) |
@@ -202,6 +204,8 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
202204
| components.router.extraEnvFrom | list | `[]` | Specify extra environment variables from ConfigMap and Secret for Router |
203205
| components.router.affinity | object | `{}` | Specify affinity for router pods, this overwrites global.seleniumGrid.affinity parameter |
204206
| components.router.topologySpreadConstraints | list | `[]` | Specify topologySpreadConstraints for router pods, this overwrites global.seleniumGrid.topologySpreadConstraints parameter |
207+
| components.router.dnsPolicy | string | `""` | Specify dnsPolicy for router pods, this overwrites global.seleniumGrid.dnsPolicy parameter |
208+
| components.router.dnsConfig | object | `{}` | Specify dnsConfig for router pods, this overwrites global.seleniumGrid.dnsConfig parameter |
205209
| components.router.annotations | object | `{}` | Custom annotations for router pods |
206210
| components.router.port | int | `4444` | Router container port |
207211
| components.router.nodePort | int | `30444` | Router expose NodePort |
@@ -232,6 +236,8 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
232236
| components.distributor.extraEnvFrom | list | `[]` | Specify extra environment variables from ConfigMap and Secret for Distributor |
233237
| components.distributor.affinity | object | `{}` | Specify affinity for distributor pods, this overwrites global.seleniumGrid.affinity parameter |
234238
| components.distributor.topologySpreadConstraints | list | `[]` | Specify topologySpreadConstraints for Distributor pods, this overwrites global.seleniumGrid.topologySpreadConstraints parameter |
239+
| components.distributor.dnsPolicy | string | `""` | Specify dnsPolicy for Distributor pods, this overwrites global.seleniumGrid.dnsPolicy parameter |
240+
| components.distributor.dnsConfig | object | `{}` | Specify dnsConfig for Distributor pods, this overwrites global.seleniumGrid.dnsConfig parameter |
235241
| components.distributor.annotations | object | `{}` | Custom annotations for Distributor pods |
236242
| components.distributor.port | int | `5553` | Distributor container port |
237243
| components.distributor.nodePort | int | `30553` | Distributor expose NodePort |
@@ -257,6 +263,8 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
257263
| components.eventBus.extraEnvFrom | list | `[]` | Specify extra environment variables from ConfigMap and Secret for Event Bus |
258264
| components.eventBus.affinity | object | `{}` | Specify affinity for Event Bus pods, this overwrites global.seleniumGrid.affinity parameter |
259265
| components.eventBus.topologySpreadConstraints | list | `[]` | Specify topologySpreadConstraints for Event Bus pods, this overwrites global.seleniumGrid.topologySpreadConstraints parameter |
266+
| components.eventBus.dnsPolicy | string | `""` | Specify dnsPolicy for Event Bus pods, this overwrites global.seleniumGrid.dnsPolicy parameter |
267+
| components.eventBus.dnsConfig | object | `{}` | Specify dnsConfig for Event Bus pods, this overwrites global.seleniumGrid.dnsConfig parameter |
260268
| components.eventBus.annotations | object | `{}` | Custom annotations for Event Bus pods |
261269
| components.eventBus.port | int | `5557` | Event Bus container port |
262270
| components.eventBus.nodePort | int | `30557` | Event Bus expose NodePort |
@@ -286,6 +294,8 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
286294
| components.sessionMap.extraEnvFrom | list | `[]` | Specify extra environment variables from ConfigMap and Secret for Session Map |
287295
| components.sessionMap.affinity | object | `{}` | Specify affinity for Session Map pods, this overwrites global.seleniumGrid.affinity parameter |
288296
| components.sessionMap.topologySpreadConstraints | list | `[]` | Specify topologySpreadConstraints for Session Map pods, this overwrites global.seleniumGrid.topologySpreadConstraints parameter |
297+
| components.sessionMap.dnsPolicy | string | `""` | Specify dnsPolicy for Session Map pods, this overwrites global.seleniumGrid.dnsPolicy parameter |
298+
| components.sessionMap.dnsConfig | object | `{}` | Specify dnsConfig for Session Map pods, this overwrites global.seleniumGrid.dnsConfig parameter |
289299
| components.sessionMap.annotations | object | `{}` | Custom annotations for Session Map pods |
290300
| components.sessionMap.port | int | `5556` | Session Map container port |
291301
| components.sessionMap.resources | object | `{"limits":{"cpu":"1","memory":"1Gi"},"requests":{"cpu":"0.5","memory":"512Mi"}}` | Resources for Session Map container |
@@ -312,6 +322,8 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
312322
| components.sessionQueue.extraEnvFrom | list | `[]` | Specify extra environment variables from ConfigMap and Secret for Session Queue |
313323
| components.sessionQueue.affinity | object | `{}` | Specify affinity for Session Queue pods, this overwrites global.seleniumGrid.affinity parameter |
314324
| components.sessionQueue.topologySpreadConstraints | list | `[]` | Specify topologySpreadConstraints for Session Queue pods, this overwrites global.seleniumGrid.topologySpreadConstraints parameter |
325+
| components.sessionQueue.dnsPolicy | string | `""` | Specify dnsPolicy for Session Queue pods, this overwrites global.seleniumGrid.dnsPolicy parameter |
326+
| components.sessionQueue.dnsConfig | object | `{}` | Specify dnsConfig for Session Queue pods, this overwrites global.seleniumGrid.dnsConfig parameter |
315327
| components.sessionQueue.annotations | object | `{}` | Custom annotations for Session Queue pods |
316328
| components.sessionQueue.port | int | `5559` | Session Queue container port |
317329
| components.sessionQueue.nodePort | int | `30559` | Session Queue expose NodePort |
@@ -336,6 +348,8 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
336348
| hub.imagePullSecret | string | `""` | Image pull secret (see https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/) |
337349
| hub.affinity | object | `{}` | Specify affinity for Selenium Hub pods, this overwrites global.seleniumGrid.affinity parameter |
338350
| hub.topologySpreadConstraints | list | `[]` | Specify topologySpreadConstraints for Hub pods, this overwrites global.seleniumGrid.topologySpreadConstraints parameter |
351+
| hub.dnsPolicy | string | `""` | Specify dnsPolicy for Hub pods, this overwrites global.seleniumGrid.dnsPolicy parameter |
352+
| hub.dnsConfig | object | `{}` | Specify dnsConfig for Hub pods, this overwrites global.seleniumGrid.dnsConfig parameter |
339353
| hub.annotations | object | `{}` | Custom annotations for Selenium Hub pods |
340354
| hub.labels | object | `{}` | Custom labels for Selenium Hub pods |
341355
| hub.disableUI | bool | `false` | Disable the Grid UI |
@@ -476,6 +490,8 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
476490
| chromeNode.nodePort | string | `nil` | Node component expose NodePort |
477491
| chromeNode.affinity | object | `{}` | Specify affinity for chrome-node pods, this overwrites global.seleniumGrid.affinity parameter |
478492
| chromeNode.topologySpreadConstraints | list | `[]` | Specify topologySpreadConstraints for chrome-node pods, this overwrites global.seleniumGrid.topologySpreadConstraints parameter |
493+
| chromeNode.dnsPolicy | string | `""` | Specify dnsPolicy for chrome-node pods, this overwrites global.seleniumGrid.dnsPolicy parameter |
494+
| chromeNode.dnsConfig | object | `{}` | Specify dnsConfig for chrome-node pods, this overwrites global.seleniumGrid.dnsConfig parameter |
479495
| chromeNode.annotations | object | `{}` | Annotations for chrome-node pods |
480496
| chromeNode.labels | object | `{}` | Labels for chrome-node pods |
481497
| chromeNode.shareProcessNamespace | bool | `true` | Shared process namespace for chrome-node pods |
@@ -536,6 +552,8 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
536552
| firefoxNode.nodePort | string | `nil` | Node component expose NodePort |
537553
| firefoxNode.affinity | object | `{}` | Specify affinity for firefox-node pods, this overwrites global.seleniumGrid.affinity parameter |
538554
| firefoxNode.topologySpreadConstraints | list | `[]` | Specify topologySpreadConstraints for firefox-node pods, this overwrites global.seleniumGrid.topologySpreadConstraints parameter |
555+
| firefoxNode.dnsPolicy | string | `""` | Specify dnsPolicy for firefox-node pods, this overwrites global.seleniumGrid.dnsPolicy parameter |
556+
| firefoxNode.dnsConfig | object | `{}` | Specify dnsConfig for firefox-node pods, this overwrites global.seleniumGrid.dnsConfig parameter |
539557
| firefoxNode.annotations | object | `{}` | Annotations for firefox-node pods |
540558
| firefoxNode.labels | object | `{}` | Labels for firefox-node pods |
541559
| firefoxNode.tolerations | list | `[]` | Tolerations for firefox-node pods |
@@ -596,6 +614,8 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
596614
| edgeNode.nodePort | string | `nil` | Node component expose NodePort |
597615
| edgeNode.affinity | object | `{}` | Specify affinity for edge-node pods, this overwrites global.seleniumGrid.affinity parameter |
598616
| edgeNode.topologySpreadConstraints | list | `[]` | Specify topologySpreadConstraints for edge-node pods, this overwrites global.seleniumGrid.topologySpreadConstraints parameter |
617+
| edgeNode.dnsPolicy | string | `""` | Specify dnsPolicy for edge-node pods, this overwrites global.seleniumGrid.dnsPolicy parameter |
618+
| edgeNode.dnsConfig | object | `{}` | Specify dnsConfig for edge-node pods, this overwrites global.seleniumGrid.dnsConfig parameter |
599619
| edgeNode.annotations | object | `{}` | Annotations for edge-node pods |
600620
| edgeNode.labels | object | `{}` | Labels for edge-node pods |
601621
| edgeNode.tolerations | list | `[]` | Tolerations for edge-node pods |
@@ -657,6 +677,8 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
657677
| relayNode.nodePort | string | `nil` | Node component expose NodePort |
658678
| relayNode.affinity | object | `{}` | Specify affinity for relay-node pods, this overwrites global.seleniumGrid.affinity parameter |
659679
| relayNode.topologySpreadConstraints | list | `[]` | Specify topologySpreadConstraints for relay-node pods, this overwrites global.seleniumGrid.topologySpreadConstraints parameter |
680+
| relayNode.dnsPolicy | string | `""` | Specify dnsPolicy for relay-node pods, this overwrites global.seleniumGrid.dnsPolicy parameter |
681+
| relayNode.dnsConfig | object | `{}` | Specify dnsConfig for relay-node pods, this overwrites global.seleniumGrid.dnsConfig parameter |
660682
| relayNode.annotations | object | `{}` | Annotations for relay-node pods |
661683
| relayNode.labels | object | `{}` | Labels for relay-node pods |
662684
| relayNode.shareProcessNamespace | bool | `true` | Shared process namespace for relay-node pods |
@@ -750,6 +772,8 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
750772
| videoManager.extraEnvFrom | list | `[]` | Specify extra environment variables from ConfigMap and Secret for Router |
751773
| videoManager.affinity | object | `{}` | Specify affinity for router pods, this overwrites global.seleniumGrid.affinity parameter |
752774
| videoManager.topologySpreadConstraints | list | `[]` | Specify topologySpreadConstraints for router pods, this overwrites global.seleniumGrid.topologySpreadConstraints parameter |
775+
| videoManager.dnsPolicy | string | `""` | Specify dnsPolicy for file-browser pods, this overwrites global.seleniumGrid.dnsPolicy parameter |
776+
| videoManager.dnsConfig | object | `{}` | Specify dnsConfig for file-browser pods, this overwrites global.seleniumGrid.dnsConfig parameter |
753777
| videoManager.annotations | object | `{}` | Custom annotations for router pods |
754778
| videoManager.port | int | `80` | Router container port |
755779
| videoManager.nodePort | int | `30080` | Router expose NodePort |

‎charts/selenium-grid/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies:
1919
name: jaeger
2020
condition: tracing.enabled, jaeger.enabled
2121
- repository: https://prometheus-community.github.io/helm-charts
22-
version: ^83.0.0
22+
version: ^84.0.0
2323
name: kube-prometheus-stack
2424
condition: monitoring.enabled, kube-prometheus-stack.enabled
2525
- repository: https://charts.bitnami.com/bitnami

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -723,6 +723,13 @@ template:
723723
{{- $affinityYaml := default $.Values.global.seleniumGrid.affinity .node.affinity }}
724724
affinity: {{- toYaml $affinityYaml | nindent 6 }}
725725
{{- end }}
726+
{{- if or $.Values.global.seleniumGrid.dnsPolicy .node.dnsPolicy }}
727+
dnsPolicy: {{ default $.Values.global.seleniumGrid.dnsPolicy .node.dnsPolicy }}
728+
{{- end }}
729+
{{- if or $.Values.global.seleniumGrid.dnsConfig .node.dnsConfig }}
730+
{{- $dnsConfigYaml := default $.Values.global.seleniumGrid.dnsConfig .node.dnsConfig }}
731+
dnsConfig: {{- toYaml $dnsConfigYaml | nindent 6 }}
732+
{{- end }}
726733
{{- if or $.Values.global.seleniumGrid.topologySpreadConstraints .node.topologySpreadConstraints }}
727734
{{- $topologySpreadConstraints := default $.Values.global.seleniumGrid.topologySpreadConstraints .node.topologySpreadConstraints }}
728735
{{- $appName := .name }}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,13 @@ spec:
193193
{{- $affinityYaml := default .Values.global.seleniumGrid.affinity .Values.components.distributor.affinity }}
194194
affinity: {{- toYaml $affinityYaml | nindent 8 }}
195195
{{- end }}
196+
{{- if or .Values.global.seleniumGrid.dnsPolicy .Values.components.distributor.dnsPolicy }}
197+
dnsPolicy: {{ default .Values.global.seleniumGrid.dnsPolicy .Values.components.distributor.dnsPolicy }}
198+
{{- end }}
199+
{{- if or .Values.global.seleniumGrid.dnsConfig .Values.components.distributor.dnsConfig }}
200+
{{- $dnsConfigYaml := default .Values.global.seleniumGrid.dnsConfig .Values.components.distributor.dnsConfig }}
201+
dnsConfig: {{- toYaml $dnsConfigYaml | nindent 8 }}
202+
{{- end }}
196203
{{- if or .Values.global.seleniumGrid.topologySpreadConstraints .Values.components.distributor.topologySpreadConstraints }}
197204
{{- $topologySpreadConstraints := default .Values.global.seleniumGrid.topologySpreadConstraints .Values.components.distributor.topologySpreadConstraints }}
198205
topologySpreadConstraints:

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,13 @@ spec:
100100
{{- $affinityYaml := default .Values.global.seleniumGrid.affinity .Values.components.eventBus.affinity }}
101101
affinity: {{- toYaml $affinityYaml | nindent 8 }}
102102
{{- end }}
103+
{{- if or .Values.global.seleniumGrid.dnsPolicy .Values.components.eventBus.dnsPolicy }}
104+
dnsPolicy: {{ default .Values.global.seleniumGrid.dnsPolicy .Values.components.eventBus.dnsPolicy }}
105+
{{- end }}
106+
{{- if or .Values.global.seleniumGrid.dnsConfig .Values.components.eventBus.dnsConfig }}
107+
{{- $dnsConfigYaml := default .Values.global.seleniumGrid.dnsConfig .Values.components.eventBus.dnsConfig }}
108+
dnsConfig: {{- toYaml $dnsConfigYaml | nindent 8 }}
109+
{{- end }}
103110
{{- if or .Values.global.seleniumGrid.topologySpreadConstraints .Values.components.eventBus.topologySpreadConstraints }}
104111
{{- $topologySpreadConstraints := default .Values.global.seleniumGrid.topologySpreadConstraints .Values.components.eventBus.topologySpreadConstraints }}
105112
topologySpreadConstraints:

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,13 @@ spec:
190190
{{- $affinityYaml := default .Values.global.seleniumGrid.affinity .Values.hub.affinity }}
191191
affinity: {{- toYaml $affinityYaml | nindent 8 }}
192192
{{- end }}
193+
{{- if or .Values.global.seleniumGrid.dnsPolicy .Values.hub.dnsPolicy }}
194+
dnsPolicy: {{ default .Values.global.seleniumGrid.dnsPolicy .Values.hub.dnsPolicy }}
195+
{{- end }}
196+
{{- if or .Values.global.seleniumGrid.dnsConfig .Values.hub.dnsConfig }}
197+
{{- $dnsConfigYaml := default .Values.global.seleniumGrid.dnsConfig .Values.hub.dnsConfig }}
198+
dnsConfig: {{- toYaml $dnsConfigYaml | nindent 8 }}
199+
{{- end }}
193200
{{- if or .Values.global.seleniumGrid.topologySpreadConstraints .Values.hub.topologySpreadConstraints }}
194201
{{- $topologySpreadConstraints := default .Values.global.seleniumGrid.topologySpreadConstraints .Values.hub.topologySpreadConstraints }}
195202
topologySpreadConstraints:

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,13 @@ spec:
173173
{{- $affinityYaml := default .Values.global.seleniumGrid.affinity .Values.components.router.affinity }}
174174
affinity: {{- toYaml $affinityYaml | nindent 8 }}
175175
{{- end }}
176+
{{- if or .Values.global.seleniumGrid.dnsPolicy .Values.components.router.dnsPolicy }}
177+
dnsPolicy: {{ default .Values.global.seleniumGrid.dnsPolicy .Values.components.router.dnsPolicy }}
178+
{{- end }}
179+
{{- if or .Values.global.seleniumGrid.dnsConfig .Values.components.router.dnsConfig }}
180+
{{- $dnsConfigYaml := default .Values.global.seleniumGrid.dnsConfig .Values.components.router.dnsConfig }}
181+
dnsConfig: {{- toYaml $dnsConfigYaml | nindent 8 }}
182+
{{- end }}
176183
{{- if or .Values.global.seleniumGrid.topologySpreadConstraints .Values.components.router.topologySpreadConstraints }}
177184
{{- $topologySpreadConstraints := default .Values.global.seleniumGrid.topologySpreadConstraints .Values.components.router.topologySpreadConstraints }}
178185
topologySpreadConstraints:

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,13 @@ spec:
101101
{{- $affinityYaml := default .Values.global.seleniumGrid.affinity .Values.components.sessionMap.affinity }}
102102
affinity: {{- toYaml $affinityYaml | nindent 8 }}
103103
{{- end }}
104+
{{- if or .Values.global.seleniumGrid.dnsPolicy .Values.components.sessionMap.dnsPolicy }}
105+
dnsPolicy: {{ default .Values.global.seleniumGrid.dnsPolicy .Values.components.sessionMap.dnsPolicy }}
106+
{{- end }}
107+
{{- if or .Values.global.seleniumGrid.dnsConfig .Values.components.sessionMap.dnsConfig }}
108+
{{- $dnsConfigYaml := default .Values.global.seleniumGrid.dnsConfig .Values.components.sessionMap.dnsConfig }}
109+
dnsConfig: {{- toYaml $dnsConfigYaml | nindent 8 }}
110+
{{- end }}
104111
{{- if or .Values.global.seleniumGrid.topologySpreadConstraints .Values.components.sessionMap.topologySpreadConstraints }}
105112
{{- $topologySpreadConstraints := default .Values.global.seleniumGrid.topologySpreadConstraints .Values.components.sessionMap.topologySpreadConstraints }}
106113
topologySpreadConstraints:

0 commit comments

Comments
 (0)