Skip to content

Commit e0c3beb

Browse files
authored
K8s: Bump KEDA patch version (#2575)
Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
1 parent 98dbc41 commit e0c3beb

File tree

5 files changed

+56
-44
lines changed

5 files changed

+56
-44
lines changed

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ CURRENT_PLATFORM := $(shell if [ `arch` = "aarch64" ] || [ `arch` = "arm64" ]; t
2626
PLATFORMS := $(or $(PLATFORMS),$(shell echo $$PLATFORMS),$(CURRENT_PLATFORM))
2727
SEL_PASSWD := $(or $(SEL_PASSWD),$(SEL_PASSWD),secret)
2828
CHROMIUM_VERSION := $(or $(CHROMIUM_VERSION),$(CHROMIUM_VERSION),latest)
29-
FIREFOX_DOWNLOAD_URL := $(or $(FIREFOX_DOWNLOAD_URL),$(FIREFOX_DOWNLOAD_URL),https://download-installer.cdn.mozilla.net/pub/firefox/nightly/2024/10/2024-10-28-09-56-35-mozilla-central/firefox-133.0a1.en-US.linux-aarch64.deb)
29+
FIREFOX_DOWNLOAD_URL := $(or $(FIREFOX_DOWNLOAD_URL),$(FIREFOX_DOWNLOAD_URL),https://download-installer.cdn.mozilla.net/pub/firefox/nightly/2024/11/2024-11-25-09-40-45-mozilla-central/firefox-134.0a1.en-US.linux-aarch64.deb)
3030
SBOM_OUTPUT := $(or $(SBOM_OUTPUT),$(SBOM_OUTPUT),package_versions.txt)
3131
KEDA_TAG_PREV_VERSION := $(or $(KEDA_TAG_PREV_VERSION),$(KEDA_TAG_PREV_VERSION),2.16.1-selenium-grid)
3232
KEDA_CORE_VERSION := $(or $(KEDA_CORE_VERSION),$(KEDA_CORE_VERSION),2.16.1)
3333
KEDA_TAG_VERSION := $(or $(KEDA_TAG_VERSION),$(KEDA_TAG_VERSION),2.16.1-selenium-grid)
3434
KEDA_BASED_NAME := $(or $(KEDA_BASED_NAME),$(KEDA_BASED_NAME),ndviet)
35-
KEDA_BASED_TAG := $(or $(KEDA_BASED_TAG),$(KEDA_BASED_TAG),2.16.1-selenium-grid-20241224)
36-
TEST_PATCHED_KEDA := $(or $(TEST_PATCHED_KEDA),$(TEST_PATCHED_KEDA),false)
35+
KEDA_BASED_TAG := $(or $(KEDA_BASED_TAG),$(KEDA_BASED_TAG),2.16.1-selenium-grid-20250108)
36+
TEST_PATCHED_KEDA := $(or $(TEST_PATCHED_KEDA),$(TEST_PATCHED_KEDA),true)
3737

3838
all: hub \
3939
distributor \

charts/selenium-grid/multiple-nodes-platform.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ crossBrowsers:
1919
hpa:
2020
platformName: 'Linux'
2121
browserVersion: ''
22+
- nameOverride: '{{ $.Release.Name }}-node-chrome-platform-windows'
23+
hpa:
24+
platformName: 'windows'
25+
browserVersion: ''
2226
firefoxNode:
2327
- nameOverride: '{{ $.Release.Name }}-node-firefox-platform-any'
2428
hpa:
@@ -28,6 +32,10 @@ crossBrowsers:
2832
hpa:
2933
platformName: 'Linux'
3034
browserVersion: ''
35+
- nameOverride: '{{ $.Release.Name }}-node-firefox-platform-windows'
36+
hpa:
37+
platformName: 'windows'
38+
browserVersion: ''
3139
edgeNode:
3240
- nameOverride: '{{ $.Release.Name }}-node-edge-platform-any'
3341
hpa:
@@ -37,3 +45,7 @@ crossBrowsers:
3745
hpa:
3846
platformName: 'Linux'
3947
browserVersion: ''
48+
- nameOverride: '{{ $.Release.Name }}-node-edge-platform-windows'
49+
hpa:
50+
platformName: 'windows'
51+
browserVersion: ''

tests/SeleniumTests/__init__.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
TEST_MULTIPLE_VERSIONS_EXPLICIT = os.environ.get('TEST_MULTIPLE_VERSIONS_EXPLICIT', 'true').lower() == 'true'
3737
LIST_CHROMIUM_VERSIONS = ['130.0', '129.0', '128.0']
3838
LIST_FIREFOX_VERSIONS = ['132.0', '131.0', '130.0', '129.0', '128.0']
39-
LIST_PLATFORMS = ['Linux', None]
39+
LIST_PLATFORMS = ['Linux', None, 'Windows']
4040

4141
if not TEST_MULTIPLE_VERSIONS_EXPLICIT:
4242
LIST_CHROMIUM_VERSIONS.append(None)
@@ -169,7 +169,7 @@ def setUp(self):
169169
browser_version = random.choice(LIST_CHROMIUM_VERSIONS)
170170
if browser_version:
171171
options.set_capability('browserVersion', browser_version)
172-
options.set_capability('platformName', 'Linux')
172+
options.set_capability('platformName', LIST_PLATFORMS[0])
173173
if TEST_NODE_RELAY == 'Android':
174174
options.set_capability('platformName', TEST_NODE_RELAY)
175175
options.set_capability('appium:platformVersion', TEST_ANDROID_PLATFORM_API)
@@ -218,7 +218,7 @@ def setUp(self):
218218
browser_version = random.choice(LIST_CHROMIUM_VERSIONS)
219219
if browser_version:
220220
options.set_capability('browserVersion', browser_version)
221-
options.set_capability('platformName', 'Linux')
221+
options.set_capability('platformName', LIST_PLATFORMS[0])
222222
if TEST_MULTIPLE_PLATFORMS:
223223
platform_name = random.choice(LIST_PLATFORMS)
224224
if platform_name:
@@ -261,7 +261,7 @@ def setUp(self):
261261
browser_version = random.choice(LIST_FIREFOX_VERSIONS)
262262
if browser_version:
263263
options.set_capability('browserVersion', browser_version)
264-
options.set_capability('platformName', 'Linux')
264+
options.set_capability('platformName', LIST_PLATFORMS[0])
265265
if TEST_MULTIPLE_PLATFORMS:
266266
platform_name = random.choice(LIST_PLATFORMS)
267267
if platform_name:

tests/charts/ci/local-pvc.yaml

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,3 @@
1-
apiVersion: apps/v1
2-
kind: Deployment
3-
metadata:
4-
name: ftp-server
5-
namespace: ${SELENIUM_NAMESPACE}
6-
spec:
7-
replicas: 1
8-
selector:
9-
matchLabels:
10-
app: ftp-server
11-
template:
12-
metadata:
13-
labels:
14-
app: ftp-server
15-
spec:
16-
containers:
17-
- name: ftp-server
18-
image: delfer/alpine-ftp-server:latest
19-
env:
20-
- name: USERS
21-
value: "seluser|selenium.dev"
22-
- name: MAX_PORT
23-
value: "21005"
24-
- name: TINI_SUBREAPER
25-
value: "true"
26-
volumeMounts:
27-
- mountPath: /ftp/seluser
28-
name: ftp-upload
29-
subPath: seluser
30-
command: ["/bin/sh", "-c", "/sbin/tini -- /bin/start_vsftpd.sh && tail -f /dev/null"]
31-
volumes:
32-
- name: ftp-upload
33-
persistentVolumeClaim:
34-
claimName: ${TEST_PV_CLAIM_NAME}
35-
---
361
apiVersion: v1
372
kind: Service
383
metadata:
@@ -73,6 +38,41 @@ spec:
7338
port: 21005
7439
targetPort: 21005
7540
---
41+
apiVersion: apps/v1
42+
kind: Deployment
43+
metadata:
44+
name: ftp-server
45+
namespace: ${SELENIUM_NAMESPACE}
46+
spec:
47+
replicas: 1
48+
selector:
49+
matchLabels:
50+
app: ftp-server
51+
template:
52+
metadata:
53+
labels:
54+
app: ftp-server
55+
spec:
56+
containers:
57+
- name: ftp-server
58+
image: delfer/alpine-ftp-server:latest
59+
env:
60+
- name: USERS
61+
value: "seluser|selenium.dev"
62+
- name: MAX_PORT
63+
value: "21005"
64+
- name: TINI_SUBREAPER
65+
value: "true"
66+
volumeMounts:
67+
- mountPath: /ftp/seluser
68+
name: ftp-upload
69+
subPath: seluser
70+
command: ["/bin/sh", "-c", "/sbin/tini -- /bin/start_vsftpd.sh && tail -f /dev/null"]
71+
volumes:
72+
- name: ftp-upload
73+
persistentVolumeClaim:
74+
claimName: ${TEST_PV_CLAIM_NAME}
75+
---
7676
apiVersion: v1
7777
kind: PersistentVolumeClaim
7878
metadata:
@@ -105,5 +105,5 @@ spec:
105105
hostPath:
106106
path: "${HOST_PATH}"
107107
type: DirectoryOrCreate
108-
persistentVolumeReclaimPolicy: Retain
108+
persistentVolumeReclaimPolicy: Delete
109109
storageClassName: "standard"

tests/charts/make/chart_test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ if [ "${TEST_UPGRADE_CHART}" != "true" ] && [ "${RENDER_HELM_TEMPLATE_ONLY}" !=
151151
LOCAL_PVC_YAML="${TEST_VALUES_PATH}/local-pvc.yaml"
152152
envsubst < ${LOCAL_PVC_YAML} > ./tests/tests/local-pvc.yaml
153153
LOCAL_PVC_YAML=./tests/tests/local-pvc.yaml
154-
kubectl delete -n ${SELENIUM_NAMESPACE} -f ${LOCAL_PVC_YAML} --ignore-not-found=true
154+
# kubectl delete -n ${SELENIUM_NAMESPACE} -f ${LOCAL_PVC_YAML} --ignore-not-found=true
155155
sudo rm -rf ${HOST_PATH}; sudo mkdir -p ${HOST_PATH}/logs
156156
sudo chmod -R 777 ${HOST_PATH}
157157
kubectl create ns ${SELENIUM_NAMESPACE} || true

0 commit comments

Comments
 (0)