From c2e94bc193320cdf798653275420e17774c87036 Mon Sep 17 00:00:00 2001 From: Viet Nguyen Duc Date: Tue, 23 Jul 2024 17:35:05 +0000 Subject: [PATCH] chart(add): Set pod/container name to node stereotypes Signed-off-by: Viet Nguyen Duc --- .circleci/config.yml | 10 +++++----- .github/workflows/helm-chart-test.yml | 10 +++++----- NodeBase/generate_config | 2 +- Standalone/generate_config | 2 +- charts/selenium-grid/templates/_helpers.tpl | 4 ++++ tests/charts/make/chart_setup_env.sh | 5 ++++- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f06823cda..c88ea673a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,7 +27,7 @@ workflows: name: "K8s test - Autoscaling Deployments" platforms: linux/arm64 machine-type: ubuntu2204arm64large - k8s-version: 'v1.27.15' + k8s-version: 'v1.27.16' test-strategy: deployment cluster: 'minikube' helm-version: 'v3.12.3' @@ -37,7 +37,7 @@ workflows: name: "K8s test - Autoscaling Jobs - HTTPS" platforms: linux/arm64 machine-type: ubuntu2204arm64large - k8s-version: 'v1.28.11' + k8s-version: 'v1.28.12' test-strategy: job_https cluster: 'minikube' helm-version: 'v3.13.3' @@ -47,7 +47,7 @@ workflows: name: "K8s test - Autoscaling Jobs - Ingress hostname" platforms: linux/arm64 machine-type: ubuntu2204arm64large - k8s-version: 'v1.29.6' + k8s-version: 'v1.29.7' test-strategy: job_hostname cluster: 'minikube' helm-version: 'v3.14.4' @@ -57,10 +57,10 @@ workflows: name: "K8s test - Autoscaling Deployments - HTTPS" platforms: linux/arm64 machine-type: ubuntu2204arm64large - k8s-version: 'v1.30.2' + k8s-version: 'v1.30.3' test-strategy: deployment_https cluster: 'minikube' - helm-version: 'v3.15.2' + helm-version: 'v3.15.3' test-existing-keda: false test-upgrade: true - docker-test: diff --git a/.github/workflows/helm-chart-test.yml b/.github/workflows/helm-chart-test.yml index 7e02e2fda..05184dc8d 100644 --- a/.github/workflows/helm-chart-test.yml +++ b/.github/workflows/helm-chart-test.yml @@ -46,28 +46,28 @@ jobs: helm-version: 'v3.11.3' test-existing-keda: true test-upgrade: true - - k8s-version: 'v1.27.15' + - k8s-version: 'v1.27.16' test-strategy: deployment cluster: 'minikube' helm-version: 'v3.12.3' test-existing-keda: true test-upgrade: true - - k8s-version: 'v1.28.11' + - k8s-version: 'v1.28.12' test-strategy: job_https cluster: 'minikube' helm-version: 'v3.13.3' test-existing-keda: true test-upgrade: true - - k8s-version: 'v1.29.6' + - k8s-version: 'v1.29.7' test-strategy: job_hostname cluster: 'minikube' helm-version: 'v3.14.4' test-existing-keda: false test-upgrade: true - - k8s-version: 'v1.30.2' + - k8s-version: 'v1.30.3' test-strategy: deployment_https cluster: 'minikube' - helm-version: 'v3.15.2' + helm-version: 'v3.15.3' test-existing-keda: false test-upgrade: true env: diff --git a/NodeBase/generate_config b/NodeBase/generate_config index aab92d856..1bf23178e 100755 --- a/NodeBase/generate_config +++ b/NodeBase/generate_config @@ -64,7 +64,7 @@ fi # 'browserName' is mandatory for default stereotype if [[ -z "${SE_NODE_STEREOTYPE}" ]] && [[ -n "${SE_NODE_BROWSER_NAME}" ]]; then -SE_NODE_STEREOTYPE="{\"browserName\": \"${SE_NODE_BROWSER_NAME}\", \"browserVersion\": \"${SE_NODE_BROWSER_VERSION}\", \"platformName\": \"Linux\", ${SE__BROWSER_BINARY_LOCATION}}" +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}\"}" else SE_NODE_STEREOTYPE="${SE_NODE_STEREOTYPE}" fi diff --git a/Standalone/generate_config b/Standalone/generate_config index fe4d74c4b..4394527bb 100755 --- a/Standalone/generate_config +++ b/Standalone/generate_config @@ -37,7 +37,7 @@ SE_NODE_BROWSER_VERSION=$(short_version $(cat /opt/selenium/browser_version)) SE__BROWSER_BINARY_LOCATION=$(cat /opt/selenium/browser_binary_location) if [[ -z "$SE_NODE_STEREOTYPE" ]]; then -SE_NODE_STEREOTYPE="{\"browserName\": \"${SE_NODE_BROWSER_NAME}\", \"browserVersion\": \"${SE_NODE_BROWSER_VERSION}\", \"platformName\": \"Linux\", ${SE__BROWSER_BINARY_LOCATION}}" +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}\"}" else SE_NODE_STEREOTYPE="$SE_NODE_STEREOTYPE" fi diff --git a/charts/selenium-grid/templates/_helpers.tpl b/charts/selenium-grid/templates/_helpers.tpl index 91aa95f69..ed241d769 100644 --- a/charts/selenium-grid/templates/_helpers.tpl +++ b/charts/selenium-grid/templates/_helpers.tpl @@ -250,6 +250,10 @@ template: image: {{ printf "%s/%s:%s" $imageRegistry .node.imageName $imageTag }} imagePullPolicy: {{ .node.imagePullPolicy }} env: + - name: SE_NODE_CONTAINER_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name {{- if empty .node.dshmVolumeSizeLimit }} - name: SE_BROWSER_ARGS_DISABLE_DSHM value: "--disable-dev-shm-usage" diff --git a/tests/charts/make/chart_setup_env.sh b/tests/charts/make/chart_setup_env.sh index 3b94a4a02..c18182372 100755 --- a/tests/charts/make/chart_setup_env.sh +++ b/tests/charts/make/chart_setup_env.sh @@ -119,7 +119,10 @@ kubectl version --client echo "===============================" echo "Installing Helm for AMD64 / ARM64" -HELM_VERSION=${HELM_VERSION:-"v3.15.2"} +HELM_VERSION=${HELM_VERSION:-"latest"} +if [ "${HELM_VERSION}" = "latest" ]; then + HELM_VERSION=$(curl -s https://api.github.com/repos/helm/helm/releases/latest | grep tag_name | cut -d '"' -f 4) +fi curl -fsSL -o helm.tar.gz https://get.helm.sh/helm-${HELM_VERSION}-linux-$(dpkg --print-architecture).tar.gz mkdir -p helm tar -xf helm.tar.gz --strip-components 1 -C helm