Skip to content

Commit 33adea2

Browse files
VietND96VietND96
authored
K8s: Update KEDA core 2.17.1 and test env versions (#2834)
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent e2abe9f commit 33adea2

File tree

7 files changed

+34
-18
lines changed

7 files changed

+34
-18
lines changed

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
os: ubuntu-22.04
9090
check-records-output: true
9191
test-strategy: job_https
92-
- k8s-version: 'v1.30.11'
92+
- k8s-version: 'v1.30.13'
9393
cluster: 'minikube'
9494
helm-version: 'v3.15.4'
9595
docker-version: '27.5.1'
@@ -99,7 +99,7 @@ jobs:
9999
os: ubuntu-22.04
100100
check-records-output: true
101101
test-strategy: job_hostname
102-
- k8s-version: 'v1.31.7'
102+
- k8s-version: 'v1.31.9'
103103
cluster: 'minikube'
104104
helm-version: 'v3.16.4'
105105
docker-version: '27.4.1'
@@ -109,19 +109,19 @@ jobs:
109109
os: ubuntu-22.04
110110
check-records-output: true
111111
test-strategy: deployment_https
112-
- k8s-version: 'v1.32.3'
112+
- k8s-version: 'v1.32.5'
113113
cluster: 'minikube'
114-
helm-version: 'v3.17.0'
114+
helm-version: 'v3.17.3'
115115
docker-version: '26.1.4'
116116
python-version: '3.10'
117117
test-upgrade: true
118118
service-mesh: false
119119
os: ubuntu-22.04
120120
check-records-output: true
121121
test-strategy: playwright_connect_grid
122-
- k8s-version: 'v1.32.3'
122+
- k8s-version: 'v1.33.1'
123123
cluster: 'minikube'
124-
helm-version: 'v3.17.0'
124+
helm-version: 'v3.17.3'
125125
docker-version: '26.1.4'
126126
python-version: '3.10'
127127
test-upgrade: true

‎.github/workflows/k8s-scaling-test.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -92,23 +92,23 @@ jobs:
9292
python-version: '3.11'
9393
os: ubuntu-22.04
9494
test-strategy: test_k8s_autoscaling_job_count_strategy_default
95-
- k8s-version: 'v1.30.11'
95+
- k8s-version: 'v1.30.13'
9696
cluster: 'minikube'
9797
helm-version: 'v3.15.4'
9898
docker-version: '27.5.1'
9999
python-version: '3.12'
100100
os: ubuntu-22.04
101101
test-strategy: test_k8s_autoscaling_deployment_count_in_chaos
102-
- k8s-version: 'v1.31.7'
102+
- k8s-version: 'v1.31.9'
103103
cluster: 'minikube'
104104
helm-version: 'v3.16.4'
105105
docker-version: '27.4.1'
106106
python-version: '3.13'
107107
os: ubuntu-22.04
108108
test-strategy: test_k8s_autoscaling_deployment_count_with_node_max_sessions
109-
- k8s-version: 'v1.32.3'
109+
- k8s-version: 'v1.32.5'
110110
cluster: 'minikube'
111-
helm-version: 'v3.17.0'
111+
helm-version: 'v3.17.3'
112112
docker-version: '26.1.4'
113113
python-version: '3.10'
114114
os: ubuntu-22.04

‎.keda/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ You can involve to review and discuss the pull requests to help us early detect
4949

5050
[kedacore/keda](https://github.com/kedacore/keda)
5151

52+
- ~~https://github.com/kedacore/keda/pull/6772 (merged, v2.17.1)~~
53+
5254
- ~~https://github.com/kedacore/keda/pull/6684 (merged, v2.17.0)~~
5355

5456
- ~~https://github.com/kedacore/keda/pull/6570 (merged, v2.17.0)~~

‎.keda/scalers/selenium_grid_scaler.go

+15-1
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,22 @@ func (s *seleniumGridScaler) GetMetricsAndActivity(ctx context.Context, metricNa
209209
return []external_metrics.ExternalMetricValue{metric}, (newRequestNodes + onGoingSessions) > s.metadata.ActivationThreshold, nil
210210
}
211211

212+
func buildSeleniumGridMetricName(meta *seleniumGridScalerMetadata) string {
213+
nameParts := []string{"selenium-grid"}
214+
if meta.BrowserName != "" {
215+
nameParts = append(nameParts, meta.BrowserName)
216+
}
217+
if meta.BrowserVersion != "" {
218+
nameParts = append(nameParts, meta.BrowserVersion)
219+
}
220+
if meta.PlatformName != "" {
221+
nameParts = append(nameParts, meta.PlatformName)
222+
}
223+
return strings.Join(nameParts, "-")
224+
}
225+
212226
func (s *seleniumGridScaler) GetMetricSpecForScaling(context.Context) []v2.MetricSpec {
213-
metricName := kedautil.NormalizeString(fmt.Sprintf("selenium-grid-%s-%s-%s", s.metadata.BrowserName, s.metadata.BrowserVersion, s.metadata.PlatformName))
227+
metricName := kedautil.NormalizeString(buildSeleniumGridMetricName(s.metadata))
214228
externalMetric := &v2.ExternalMetricSource{
215229
Metric: v2.MetricIdentifier{
216230
Name: GenerateMetricNameWithIndex(s.metadata.triggerIndex, metricName),

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ CHROMIUM_VERSION := $(or $(CHROMIUM_VERSION),$(CHROMIUM_VERSION),latest)
3131
FIREFOX_DOWNLOAD_URL := $(or $(FIREFOX_DOWNLOAD_URL),$(FIREFOX_DOWNLOAD_URL),)
3232
SBOM_OUTPUT := $(or $(SBOM_OUTPUT),$(SBOM_OUTPUT),package_versions.txt)
3333
KEDA_TAG_PREV_VERSION := $(or $(KEDA_TAG_PREV_VERSION),$(KEDA_TAG_PREV_VERSION),2.17.0-selenium-grid)
34-
KEDA_CORE_VERSION := $(or $(KEDA_CORE_VERSION),$(KEDA_CORE_VERSION),2.17.0)
35-
KEDA_TAG_VERSION := $(or $(KEDA_TAG_VERSION),$(KEDA_TAG_VERSION),2.17.0-selenium-grid)
34+
KEDA_CORE_VERSION := $(or $(KEDA_CORE_VERSION),$(KEDA_CORE_VERSION),2.17.1)
35+
KEDA_TAG_VERSION := $(or $(KEDA_TAG_VERSION),$(KEDA_TAG_VERSION),2.17.1-selenium-grid)
3636
KEDA_BASED_NAME := $(or $(KEDA_BASED_NAME),$(KEDA_BASED_NAME),ndviet)
37-
KEDA_BASED_TAG := $(or $(KEDA_BASED_TAG),$(KEDA_BASED_TAG),2.17.0-selenium-grid-20250407)
37+
KEDA_BASED_TAG := $(or $(KEDA_BASED_TAG),$(KEDA_BASED_TAG),2.17.1-selenium-grid-20250515)
3838
TEST_PATCHED_KEDA := $(or $(TEST_PATCHED_KEDA),$(TEST_PATCHED_KEDA),false)
3939

4040
all: hub \

‎tests/build-backward-compatible/browser-matrix.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ matrix:
33
'138':
44
EDGE_VERSION: null
55
CHROME_VERSION: null
6-
FIREFOX_VERSION: 138.0.1
6+
FIREFOX_VERSION: 138.0.3
77
FIREFOX_PLATFORMS: linux/amd64,linux/arm64
88
'137':
99
EDGE_VERSION: null
1010
CHROME_VERSION: null
1111
FIREFOX_VERSION: 137.0.2
1212
FIREFOX_PLATFORMS: linux/amd64,linux/arm64
1313
'136':
14-
EDGE_VERSION: microsoft-edge-stable=136.0.3240.50-1
15-
CHROME_VERSION: google-chrome-stable=136.0.7103.59-1
14+
EDGE_VERSION: microsoft-edge-stable=136.0.3240.64-1
15+
CHROME_VERSION: google-chrome-stable=136.0.7103.113-1
1616
FIREFOX_VERSION: 136.0.4
1717
FIREFOX_PLATFORMS: linux/amd64,linux/arm64
1818
'135':

‎tests/build-backward-compatible/firefox-matrix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
matrix:
22
browser:
33
'138':
4-
FIREFOX_VERSION: 138.0.1
4+
FIREFOX_VERSION: 138.0.3
55
'137':
66
FIREFOX_VERSION: 137.0.2
77
'136':

0 commit comments

Comments
 (0)