Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chart(add): Set pod/container name to node stereotypes #2323

Merged
merged 1 commit into from
Jul 24, 2024
Merged

chart(add): Set pod/container name to node stereotypes #2323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/helm-chart-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion NodeBase/generate_config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Standalone/generate_config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions charts/selenium-grid/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion tests/charts/make/chart_setup_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down