Skip to content

Commit b5d6af3

Browse files
authored
chart(add): Set pod/container name to node stereotypes (#2323)
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 9453505 commit b5d6af3

File tree

6 files changed

+20
-13
lines changed

6 files changed

+20
-13
lines changed

Diff for: .circleci/config.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ workflows:
2727
name: "K8s test - Autoscaling Deployments"
2828
platforms: linux/arm64
2929
machine-type: ubuntu2204arm64large
30-
k8s-version: 'v1.27.15'
30+
k8s-version: 'v1.27.16'
3131
test-strategy: deployment
3232
cluster: 'minikube'
3333
helm-version: 'v3.12.3'
@@ -37,7 +37,7 @@ workflows:
3737
name: "K8s test - Autoscaling Jobs - HTTPS"
3838
platforms: linux/arm64
3939
machine-type: ubuntu2204arm64large
40-
k8s-version: 'v1.28.11'
40+
k8s-version: 'v1.28.12'
4141
test-strategy: job_https
4242
cluster: 'minikube'
4343
helm-version: 'v3.13.3'
@@ -47,7 +47,7 @@ workflows:
4747
name: "K8s test - Autoscaling Jobs - Ingress hostname"
4848
platforms: linux/arm64
4949
machine-type: ubuntu2204arm64large
50-
k8s-version: 'v1.29.6'
50+
k8s-version: 'v1.29.7'
5151
test-strategy: job_hostname
5252
cluster: 'minikube'
5353
helm-version: 'v3.14.4'
@@ -57,10 +57,10 @@ workflows:
5757
name: "K8s test - Autoscaling Deployments - HTTPS"
5858
platforms: linux/arm64
5959
machine-type: ubuntu2204arm64large
60-
k8s-version: 'v1.30.2'
60+
k8s-version: 'v1.30.3'
6161
test-strategy: deployment_https
6262
cluster: 'minikube'
63-
helm-version: 'v3.15.2'
63+
helm-version: 'v3.15.3'
6464
test-existing-keda: false
6565
test-upgrade: true
6666
- docker-test:

Diff for: .github/workflows/helm-chart-test.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -46,28 +46,28 @@ jobs:
4646
helm-version: 'v3.11.3'
4747
test-existing-keda: true
4848
test-upgrade: true
49-
- k8s-version: 'v1.27.15'
49+
- k8s-version: 'v1.27.16'
5050
test-strategy: deployment
5151
cluster: 'minikube'
5252
helm-version: 'v3.12.3'
5353
test-existing-keda: true
5454
test-upgrade: true
55-
- k8s-version: 'v1.28.11'
55+
- k8s-version: 'v1.28.12'
5656
test-strategy: job_https
5757
cluster: 'minikube'
5858
helm-version: 'v3.13.3'
5959
test-existing-keda: true
6060
test-upgrade: true
61-
- k8s-version: 'v1.29.6'
61+
- k8s-version: 'v1.29.7'
6262
test-strategy: job_hostname
6363
cluster: 'minikube'
6464
helm-version: 'v3.14.4'
6565
test-existing-keda: false
6666
test-upgrade: true
67-
- k8s-version: 'v1.30.2'
67+
- k8s-version: 'v1.30.3'
6868
test-strategy: deployment_https
6969
cluster: 'minikube'
70-
helm-version: 'v3.15.2'
70+
helm-version: 'v3.15.3'
7171
test-existing-keda: false
7272
test-upgrade: true
7373
env:

Diff for: NodeBase/generate_config

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ fi
6464

6565
# 'browserName' is mandatory for default stereotype
6666
if [[ -z "${SE_NODE_STEREOTYPE}" ]] && [[ -n "${SE_NODE_BROWSER_NAME}" ]]; then
67-
SE_NODE_STEREOTYPE="{\"browserName\": \"${SE_NODE_BROWSER_NAME}\", \"browserVersion\": \"${SE_NODE_BROWSER_VERSION}\", \"platformName\": \"Linux\", ${SE__BROWSER_BINARY_LOCATION}}"
67+
SE_NODE_STEREOTYPE="{\"browserName\": \"${SE_NODE_BROWSER_NAME}\", \"browserVersion\": \"${SE_NODE_BROWSER_VERSION}\", \"platformName\": \"Linux\", ${SE__BROWSER_BINARY_LOCATION}, \"se:containerName\": \"${SE_NODE_CONTAINER_NAME}\"}"
6868
else
6969
SE_NODE_STEREOTYPE="${SE_NODE_STEREOTYPE}"
7070
fi

Diff for: Standalone/generate_config

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ SE_NODE_BROWSER_VERSION=$(short_version $(cat /opt/selenium/browser_version))
3737
SE__BROWSER_BINARY_LOCATION=$(cat /opt/selenium/browser_binary_location)
3838

3939
if [[ -z "$SE_NODE_STEREOTYPE" ]]; then
40-
SE_NODE_STEREOTYPE="{\"browserName\": \"${SE_NODE_BROWSER_NAME}\", \"browserVersion\": \"${SE_NODE_BROWSER_VERSION}\", \"platformName\": \"Linux\", ${SE__BROWSER_BINARY_LOCATION}}"
40+
SE_NODE_STEREOTYPE="{\"browserName\": \"${SE_NODE_BROWSER_NAME}\", \"browserVersion\": \"${SE_NODE_BROWSER_VERSION}\", \"platformName\": \"Linux\", ${SE__BROWSER_BINARY_LOCATION}, \"se:containerName\": \"${SE_NODE_CONTAINER_NAME}\"}"
4141
else
4242
SE_NODE_STEREOTYPE="$SE_NODE_STEREOTYPE"
4343
fi

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

+4
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,10 @@ template:
250250
image: {{ printf "%s/%s:%s" $imageRegistry .node.imageName $imageTag }}
251251
imagePullPolicy: {{ .node.imagePullPolicy }}
252252
env:
253+
- name: SE_NODE_CONTAINER_NAME
254+
valueFrom:
255+
fieldRef:
256+
fieldPath: metadata.name
253257
{{- if empty .node.dshmVolumeSizeLimit }}
254258
- name: SE_BROWSER_ARGS_DISABLE_DSHM
255259
value: "--disable-dev-shm-usage"

Diff for: tests/charts/make/chart_setup_env.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,10 @@ kubectl version --client
119119
echo "==============================="
120120

121121
echo "Installing Helm for AMD64 / ARM64"
122-
HELM_VERSION=${HELM_VERSION:-"v3.15.2"}
122+
HELM_VERSION=${HELM_VERSION:-"latest"}
123+
if [ "${HELM_VERSION}" = "latest" ]; then
124+
HELM_VERSION=$(curl -s https://api.github.com/repos/helm/helm/releases/latest | grep tag_name | cut -d '"' -f 4)
125+
fi
123126
curl -fsSL -o helm.tar.gz https://get.helm.sh/helm-${HELM_VERSION}-linux-$(dpkg --print-architecture).tar.gz
124127
mkdir -p helm
125128
tar -xf helm.tar.gz --strip-components 1 -C helm

0 commit comments

Comments
 (0)