Skip to content

Commit eec5ecc

Browse files
VietND96VietND96
authored
Bug: Error setting name in helm release #2006 #2007 (#2009)
* Bug: Error setting name in helm release #2006 Signed-off-by: Viet Nguyen Duc <[email protected]> * Add workflow to test chart Signed-off-by: Viet Nguyen Duc <[email protected]> * Update workflow to test chart Signed-off-by: Viet Nguyen Duc <[email protected]> * Update workflow to test helm chart Signed-off-by: Viet Nguyen Duc <[email protected]> * Update workflow to test chart Signed-off-by: Viet Nguyen Duc <[email protected]> * Update ConfigMap for video recorder #2007 Signed-off-by: Viet Nguyen Duc <[email protected]> * Test indidividual node to reduce unstable Insufficient cpu Signed-off-by: Viet Nguyen Duc <[email protected]> * Fix lint in test values yaml Signed-off-by: Viet Nguyen Duc <[email protected]> --------- Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 35a044a commit eec5ecc

32 files changed

+112
-77
lines changed

‎.github/workflows/helm-chart-test.yml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
name: Lint and Test Helm Charts
22

3-
on: pull_request
3+
on:
4+
push:
5+
paths:
6+
- 'charts/selenium-grid/**'
7+
pull_request:
8+
paths:
9+
- 'charts/selenium-grid/**'
10+
workflow_dispatch:
411

512
jobs:
613
lint-test:
@@ -28,27 +35,16 @@ jobs:
2835
- name: Run chart-testing (list-changed)
2936
id: list-changed
3037
run: |
31-
changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }})
38+
changed=$(ct list-changed --config tests/chart-test.yaml)
3239
if [[ -n "$changed" ]]; then
33-
echo "changed=true" >> "$GITHUB_OUTPUT"
40+
echo "{changed}={true}" >> $GITHUB_OUTPUT
3441
fi
3542
3643
- name: Run chart-testing (lint)
37-
if: steps.list-changed.outputs.changed == 'true'
38-
run: ct lint --target-branch ${{ github.event.repository.default_branch }}
44+
run: ct lint --config tests/chart-test.yaml
3945

4046
- name: Create kind cluster
41-
if: steps.list-changed.outputs.changed == 'true'
4247
uses: helm/[email protected]
4348

44-
- name: Build Helm Charts
45-
if: steps.list-changed.outputs.changed == 'true'
46-
run: |
47-
helm repo add kedacore https://kedacore.github.io/charts
48-
helm repo update
49-
cd charts
50-
helm dependency build selenium-grid
51-
5249
- name: Run chart-testing (install)
53-
if: steps.list-changed.outputs.changed == 'true'
54-
run: ct install --target-branch ${{ github.event.repository.default_branch }}
50+
run: ct install --all --config tests/chart-test.yaml

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,4 +147,5 @@ ENV/
147147

148148
# End of https://www.gitignore.io/api/python
149149
.DS_Store
150-
150+
/charts/*/charts
151+
/charts/*/**.lock

‎charts/selenium-grid/.helmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@
2121
.idea/
2222
*.tmproj
2323
.vscode/
24+
ci/

‎charts/selenium-grid/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ 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.25.0
5+
version: 0.25.1
66
appVersion: 4.15.0-20231110
77
icon: https://github.com/SeleniumHQ/docker-selenium/raw/trunk/logo.png
88
dependencies:

‎charts/selenium-grid/ci/overrideNameChrome-values.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# These desired is used to test the overrideName of the component
2+
hub:
3+
nameOverride: my-hub-name
4+
chromeNode:
5+
nameOverride: my-chrome-name
6+
edgeNode:
7+
enabled: false
8+
firefoxNode:
9+
enabled: false

‎charts/selenium-grid/ci/overrideNameEdge-values.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# These desired is used to test the overrideName of the component
2+
hub:
3+
nameOverride: my-hub-name
4+
chromeNode:
5+
enabled: false
6+
edgeNode:
7+
nameOverride: my-edge-name
8+
firefoxNode:
9+
enabled: false

‎charts/selenium-grid/ci/overrideNameFirefox-values.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# These desired is used to test the overrideName of the component
2+
hub:
3+
nameOverride: my-hub-name
4+
chromeNode:
5+
enabled: false
6+
edgeNode:
7+
enabled: false
8+
firefoxNode:
9+
nameOverride: my-firefox-name

‎charts/selenium-grid/templates/NOTES.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Selenium Grid Server deployed successfully.
22

33
{{- $svcName := ternary (include "seleniumGrid.router.fullname" . ) (include "seleniumGrid.hub.fullname" . ) .Values.isolateComponents }}
4-
{{- $appName := ternary "selenium-router" "selenium-hub" .Values.isolateComponents }}
4+
{{- $appName := ternary (include "seleniumGrid.router.fullname" . ) (include "seleniumGrid.hub.fullname" . ) .Values.isolateComponents }}
55
{{- $serviceType := ternary .Values.components.router.serviceType .Values.hub.serviceType .Values.isolateComponents }}
66
{{- $port := ternary .Values.components.router.port .Values.hub.port .Values.isolateComponents }}
77
{{- $localUrl := ternary "http://localhost:PORT" "http://localhost:PORT/wd/hub" .Values.isolateComponents }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ metadata:
55
name: {{ template "seleniumGrid.chromeNode.fullname" . }}
66
namespace: {{ .Release.Namespace }}
77
labels:
8-
app: selenium-chrome-node
9-
app.kubernetes.io/name: selenium-chrome-node
8+
app: {{ template "seleniumGrid.chromeNode.fullname" . }}
9+
app.kubernetes.io/name: {{ template "seleniumGrid.chromeNode.fullname" . }}
1010
{{- include "seleniumGrid.commonLabels" . | nindent 4 }}
1111
{{- with .Values.chromeNode.labels }}
1212
{{- toYaml . | nindent 4 }}
@@ -20,7 +20,7 @@ spec:
2020
{{end}}
2121
selector:
2222
matchLabels:
23-
app: selenium-chrome-node
23+
app: {{ template "seleniumGrid.chromeNode.fullname" . }}
2424
app.kubernetes.io/instance: {{ .Release.Name }}
2525
{{- $podScope := deepCopy . -}}
2626
{{- $_ := set $podScope "name" (include "seleniumGrid.chromeNode.fullname" .) -}}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ metadata:
99
{{- toYaml . | nindent 4 }}
1010
{{- end }}
1111
labels:
12-
app: selenium-chrome-node
13-
app.kubernetes.io/name: selenium-chrome-node
12+
app: {{ template "seleniumGrid.chromeNode.fullname" . }}
13+
app.kubernetes.io/name: {{ template "seleniumGrid.chromeNode.fullname" . }}
1414
{{- include "seleniumGrid.commonLabels" . | nindent 4 }}
1515
{{- with .Values.chromeNode.labels }}
1616
{{- toYaml . | nindent 4 }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: {{ template "seleniumGrid.chromeNode.fullname" . }}
66
namespace: {{ .Release.Namespace }}
77
labels:
8-
name: selenium-chrome-node
8+
name: {{ template "seleniumGrid.chromeNode.fullname" . }}
99
{{- include "seleniumGrid.commonLabels" . | nindent 4 }}
1010
{{- with .Values.chromeNode.service.annotations }}
1111
annotations:
@@ -14,7 +14,7 @@ metadata:
1414
spec:
1515
type: {{ .Values.chromeNode.service.type }}
1616
selector:
17-
app: selenium-chrome-node
17+
app: {{ template "seleniumGrid.chromeNode.fullname" . }}
1818
app.kubernetes.io/instance: {{ .Release.Name }}
1919
{{- if and (eq .Values.chromeNode.service.type "LoadBalancer") (.Values.chromeNode.service.loadBalancerIP) }}
2020
loadBalancerIP: {{ .Values.chromeNode.service.loadBalancerIP }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ metadata:
55
name: {{ template "seleniumGrid.distributor.fullname" . }}
66
namespace: {{ .Release.Namespace }}
77
labels: &distributor_labels
8-
app: selenium-distributor
9-
app.kubernetes.io/name: selenium-distributor
8+
app: {{ template "seleniumGrid.distributor.fullname" . }}
9+
app.kubernetes.io/name: {{ template "seleniumGrid.distributor.fullname" . }}
1010
{{- include "seleniumGrid.commonLabels" . | nindent 4 }}
1111
{{- with .Values.customLabels }}
1212
{{- toYaml . | nindent 4 }}
@@ -15,7 +15,7 @@ spec:
1515
replicas: 1
1616
selector:
1717
matchLabels:
18-
app: selenium-distributor
18+
app: {{ template "seleniumGrid.distributor.fullname" . }}
1919
app.kubernetes.io/instance: {{ .Release.Name }}
2020
template:
2121
metadata:
@@ -27,7 +27,7 @@ spec:
2727
serviceAccountName: {{ template "seleniumGrid.serviceAccount.fullname" . }}
2828
serviceAccount: {{ template "seleniumGrid.serviceAccount.fullname" . }}
2929
containers:
30-
- name: selenium-distributor
30+
- name: {{ template "seleniumGrid.distributor.fullname" . }}
3131
{{- $imageTag := default .Values.global.seleniumGrid.imageTag .Values.components.distributor.imageTag }}
3232
image: {{ printf "%s:%s" .Values.components.distributor.imageName $imageTag }}
3333
imagePullPolicy: {{ .Values.components.distributor.imagePullPolicy }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: {{ template "seleniumGrid.distributor.fullname" . }}
66
namespace: {{ .Release.Namespace }}
77
labels:
8-
app: selenium-distributor
8+
app: {{ template "seleniumGrid.distributor.fullname" . }}
99
{{- include "seleniumGrid.commonLabels" . | nindent 4 }}
1010
{{- with .Values.customLabels }}
1111
{{- toYaml . | nindent 4 }}
@@ -15,7 +15,7 @@ metadata:
1515
{{- end }}
1616
spec:
1717
selector:
18-
app: selenium-distributor
18+
app: {{ template "seleniumGrid.distributor.fullname" . }}
1919
app.kubernetes.io/instance: {{ .Release.Name }}
2020
type: {{ .Values.components.distributor.serviceType }}
2121
ports:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ metadata:
55
name: {{ template "seleniumGrid.edgeNode.fullname" . }}
66
namespace: {{ .Release.Namespace }}
77
labels:
8-
app: selenium-edge-node
9-
app.kubernetes.io/name: selenium-edge-node
8+
app: {{ template "seleniumGrid.edgeNode.fullname" . }}
9+
app.kubernetes.io/name: {{ template "seleniumGrid.edgeNode.fullname" . }}
1010
{{- include "seleniumGrid.commonLabels" . | nindent 4 }}
1111
{{- with .Values.edgeNode.labels }}
1212
{{- toYaml . | nindent 4 }}
@@ -20,7 +20,7 @@ spec:
2020
{{end}}
2121
selector:
2222
matchLabels:
23-
app: selenium-edge-node
23+
app: {{ template "seleniumGrid.edgeNode.fullname" . }}
2424
app.kubernetes.io/instance: {{ .Release.Name }}
2525
{{- $podScope := deepCopy . -}}
2626
{{- $_ := set $podScope "name" (include "seleniumGrid.edgeNode.fullname" .) -}}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ metadata:
99
{{- toYaml . | nindent 4 }}
1010
{{- end }}
1111
labels:
12-
app: selenium-edge-node
13-
app.kubernetes.io/name: selenium-edge-node
12+
app: {{ template "seleniumGrid.edgeNode.fullname" . }}
13+
app.kubernetes.io/name: {{ template "seleniumGrid.edgeNode.fullname" . }}
1414
{{- include "seleniumGrid.commonLabels" . | nindent 4 }}
1515
{{- with .Values.edgeNode.labels }}
1616
{{- toYaml . | nindent 4 }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: {{ template "seleniumGrid.edgeNode.fullname" . }}
66
namespace: {{ .Release.Namespace }}
77
labels:
8-
name: selenium-edge-node
8+
name: {{ template "seleniumGrid.edgeNode.fullname" . }}
99
{{- include "seleniumGrid.commonLabels" . | nindent 4 }}
1010
{{- with .Values.edgeNode.service.annotations }}
1111
annotations:
@@ -14,7 +14,7 @@ metadata:
1414
spec:
1515
type: {{ .Values.edgeNode.service.type }}
1616
selector:
17-
app: selenium-edge-node
17+
app: {{ template "seleniumGrid.edgeNode.fullname" . }}
1818
app.kubernetes.io/instance: {{ .Release.Name }}
1919
{{- if and (eq .Values.edgeNode.service.type "LoadBalancer") (.Values.edgeNode.service.loadBalancerIP) }}
2020
loadBalancerIP: {{ .Values.edgeNode.service.loadBalancerIP }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ metadata:
55
name: {{ template "seleniumGrid.eventBus.fullname" . }}
66
namespace: {{ .Release.Namespace }}
77
labels: &event_bus_labels
8-
app: selenium-event-bus
9-
app.kubernetes.io/name: selenium-event-bus
8+
app: {{ template "seleniumGrid.eventBus.fullname" . }}
9+
app.kubernetes.io/name: {{ template "seleniumGrid.eventBus.fullname" . }}
1010
{{- include "seleniumGrid.commonLabels" . | nindent 4 }}
1111
{{- with .Values.customLabels }}
1212
{{- toYaml . | nindent 4 }}
@@ -15,7 +15,7 @@ spec:
1515
replicas: 1
1616
selector:
1717
matchLabels:
18-
app: selenium-event-bus
18+
app: {{ template "seleniumGrid.eventBus.fullname" . }}
1919
app.kubernetes.io/instance: {{ .Release.Name }}
2020
template:
2121
metadata:
@@ -27,7 +27,7 @@ spec:
2727
serviceAccountName: {{ template "seleniumGrid.serviceAccount.fullname" . }}
2828
serviceAccount: {{ template "seleniumGrid.serviceAccount.fullname" . }}
2929
containers:
30-
- name: selenium-event-bus
30+
- name: {{ template "seleniumGrid.eventBus.fullname" . }}
3131
{{- $imageTag := default .Values.global.seleniumGrid.imageTag .Values.components.eventBus.imageTag }}
3232
image: {{ printf "%s:%s" .Values.components.eventBus.imageName $imageTag }}
3333
imagePullPolicy: {{ .Values.components.eventBus.imagePullPolicy }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: {{ template "seleniumGrid.eventBus.fullname" . }}
66
namespace: {{ .Release.Namespace }}
77
labels:
8-
app: selenium-event-bus
8+
app: {{ template "seleniumGrid.eventBus.fullname" . }}
99
{{- include "seleniumGrid.commonLabels" . | nindent 4 }}
1010
{{- with .Values.customLabels }}
1111
{{- toYaml . | nindent 4 }}
@@ -15,7 +15,7 @@ metadata:
1515
{{- end }}
1616
spec:
1717
selector:
18-
app: selenium-event-bus
18+
app: {{ template "seleniumGrid.eventBus.fullname" . }}
1919
app.kubernetes.io/instance: {{ .Release.Name }}
2020
type: {{ .Values.components.eventBus.serviceType }}
2121
ports:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ metadata:
55
name: {{ template "seleniumGrid.firefoxNode.fullname" . }}
66
namespace: {{ .Release.Namespace }}
77
labels:
8-
app: selenium-firefox-node
9-
app.kubernetes.io/name: selenium-firefox-node
8+
app: {{ template "seleniumGrid.firefoxNode.fullname" . }}
9+
app.kubernetes.io/name: {{ template "seleniumGrid.firefoxNode.fullname" . }}
1010
{{- include "seleniumGrid.commonLabels" . | nindent 4 }}
1111
{{- with .Values.firefoxNode.labels }}
1212
{{- toYaml . | nindent 4 }}
@@ -20,7 +20,7 @@ spec:
2020
{{end}}
2121
selector:
2222
matchLabels:
23-
app: selenium-firefox-node
23+
app: {{ template "seleniumGrid.firefoxNode.fullname" . }}
2424
app.kubernetes.io/instance: {{ .Release.Name }}
2525
{{- $podScope := deepCopy . -}}
2626
{{- $_ := set $podScope "name" (include "seleniumGrid.firefoxNode.fullname" .) -}}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ metadata:
99
{{- toYaml . | nindent 4 }}
1010
{{- end }}
1111
labels:
12-
app: selenium-firefox-node
13-
app.kubernetes.io/name: selenium-firefox-node
12+
app: {{ template "seleniumGrid.firefoxNode.fullname" . }}
13+
app.kubernetes.io/name: {{ template "seleniumGrid.firefoxNode.fullname" . }}
1414
{{- include "seleniumGrid.commonLabels" . | nindent 4 }}
1515
{{- with .Values.firefoxNode.labels }}
1616
{{- toYaml . | nindent 4 }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: {{ template "seleniumGrid.firefoxNode.fullname" . }}
66
namespace: {{ .Release.Namespace }}
77
labels:
8-
name: selenium-firefox-node
8+
name: {{ template "seleniumGrid.firefoxNode.fullname" . }}
99
{{- include "seleniumGrid.commonLabels" . | nindent 4 }}
1010
{{- with .Values.firefoxNode.service.annotations }}
1111
annotations:
@@ -14,7 +14,7 @@ metadata:
1414
spec:
1515
type: {{ .Values.firefoxNode.service.type }}
1616
selector:
17-
app: selenium-firefox-node
17+
app: {{ template "seleniumGrid.firefoxNode.fullname" . }}
1818
app.kubernetes.io/instance: {{ .Release.Name }}
1919
{{- if and (eq .Values.firefoxNode.service.type "LoadBalancer") (.Values.firefoxNode.service.loadBalancerIP) }}
2020
loadBalancerIP: {{ .Values.firefoxNode.service.loadBalancerIP }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ metadata:
55
name: {{ template "seleniumGrid.hub.fullname" . }}
66
namespace: {{ .Release.Namespace }}
77
labels: &hub_labels
8-
app: selenium-hub
9-
app.kubernetes.io/name: selenium-hub
8+
app: {{ template "seleniumGrid.hub.fullname" . }}
9+
app.kubernetes.io/name: {{ template "seleniumGrid.hub.fullname" . }}
1010
{{- include "seleniumGrid.commonLabels" . | nindent 4 }}
1111
{{- with .Values.hub.labels }}
1212
{{- toYaml . | nindent 4 }}
@@ -18,7 +18,7 @@ spec:
1818
replicas: 1
1919
selector:
2020
matchLabels:
21-
app: selenium-hub
21+
app: {{ template "seleniumGrid.hub.fullname" . }}
2222
app.kubernetes.io/instance: {{ .Release.Name }}
2323
template:
2424
metadata:
@@ -30,7 +30,7 @@ spec:
3030
serviceAccountName: {{ template "seleniumGrid.serviceAccount.fullname" . }}
3131
serviceAccount: {{ template "seleniumGrid.serviceAccount.fullname" . }}
3232
containers:
33-
- name: selenium-hub
33+
- name: {{ template "seleniumGrid.hub.fullname" . }}
3434
{{- $imageTag := default .Values.global.seleniumGrid.imageTag .Values.hub.imageTag }}
3535
image: {{ printf "%s:%s" .Values.hub.imageName $imageTag }}
3636
imagePullPolicy: {{ .Values.hub.imagePullPolicy }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: {{ template "seleniumGrid.hub.fullname" . }}
66
namespace: {{ .Release.Namespace }}
77
labels:
8-
app: selenium-hub
8+
app: {{ template "seleniumGrid.hub.fullname" . }}
99
{{- include "seleniumGrid.commonLabels" . | nindent 4 }}
1010
{{- with .Values.customLabels }}
1111
{{- toYaml . | nindent 4 }}
@@ -15,7 +15,7 @@ metadata:
1515
{{- end }}
1616
spec:
1717
selector:
18-
app: selenium-hub
18+
app: {{ template "seleniumGrid.hub.fullname" . }}
1919
app.kubernetes.io/instance: {{ .Release.Name }}
2020
type: {{ .Values.hub.serviceType }}
2121
{{- if and (eq .Values.hub.serviceType "LoadBalancer") ( .Values.hub.loadBalancerIP ) }}

0 commit comments

Comments
 (0)