Skip to content

Commit 9cc943b

Browse files
authored
K8s: KEDA 2.20.1+ unsupported job scale strategy "default" (#3149)
Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com> [skip ci]
1 parent ea4d5d1 commit 9cc943b

6 files changed

Lines changed: 8 additions & 8 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1428,7 +1428,7 @@ test_k8s_autoscaling_job_count_strategy_default_with_node_max_sessions:
14281428
make test_k8s_autoscaling_job_count_strategy_default
14291429

14301430
test_k8s_autoscaling_job_count_strategy_default:
1431-
MATRIX_TESTS=$(or $(MATRIX_TESTS), "AutoscalingTestsScaleUp") SCALING_STRATEGY=$(or $(SCALING_STRATEGY), "default") TEST_MULTIPLE_PLATFORMS=true \
1431+
MATRIX_TESTS=$(or $(MATRIX_TESTS), "AutoscalingTestsScaleUp") SCALING_STRATEGY=$(or $(SCALING_STRATEGY), "accurate") TEST_MULTIPLE_PLATFORMS=true \
14321432
PLATFORMS=$(PLATFORMS) RELEASE_NAME=selenium TEST_PATCHED_KEDA=$(TEST_PATCHED_KEDA) SELENIUM_GRID_PROTOCOL=http SELENIUM_GRID_HOST=localhost SELENIUM_GRID_PORT=80 \
14331433
SELENIUM_GRID_MONITORING=false CLEAR_POD_HISTORY=true SET_MAX_REPLICAS=100 ENABLE_VIDEO_RECORDER=false \
14341434
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) KEDA_BASED_NAME=$(KEDA_BASED_NAME) KEDA_BASED_TAG=$(KEDA_BASED_TAG) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) BASE_VERSION=$(BASE_VERSION) \

charts/selenium-grid/CONFIGURATION.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
450450
| autoscaling.scaledOptions.maxReplicaCount | int | `24` | Maximum number of replicas |
451451
| autoscaling.scaledOptions.pollingInterval | int | `20` | Polling interval in seconds |
452452
| autoscaling.scaledOptions.triggers | list | `[]` | List of triggers. Be careful, the default trigger of `selenium-grid` will be overwritten if you specify this |
453-
| autoscaling.scaledJobOptions.scalingStrategy.strategy | string | `"default"` | Scaling strategy for KEDA ScaledJob - https://keda.sh/docs/latest/reference/scaledjob-spec/#scalingstrategy |
453+
| autoscaling.scaledJobOptions.scalingStrategy.strategy | string | `"accurate"` | Scaling strategy for KEDA ScaledJob - https://keda.sh/docs/latest/reference/scaledjob-spec/#scalingstrategy |
454454
| autoscaling.scaledJobOptions.successfulJobsHistoryLimit | int | `0` | Number of Completed jobs should be kept |
455455
| autoscaling.scaledJobOptions.failedJobsHistoryLimit | int | `0` | Number of Failed jobs should be kept (for troubleshooting purposes) |
456456
| autoscaling.scaledJobOptions.jobTargetRef | object | `{"backoffLimit":0,"completions":1,"parallelism":1}` | Specify job target ref for KEDA ScaledJob |

charts/selenium-grid/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ autoscaling:
229229

230230
Settings that KEDA [ScaledJob spec](https://keda.sh/docs/latest/concepts/scaling-jobs/#scaledjob-spec) supports can be set via `autoscaling.scaledJobOptions`.
231231

232-
Expected that with default configuration in KEDA resource, autoscaling behavior should be correct. Hence, in chart values, we keep the config key `autoscaling.scaledJobOptions.scalingStrategy.strategy` is `default`.
232+
Expected that with default configuration in KEDA resource, autoscaling behavior should be correct. Hence, in chart values, we keep the config key `autoscaling.scaledJobOptions.scalingStrategy.strategy` is `accurate`.
233233

234234
### Scaler trigger configuration
235235

charts/selenium-grid/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1183,7 +1183,7 @@ autoscaling:
11831183
scaledJobOptions:
11841184
scalingStrategy:
11851185
# -- Scaling strategy for KEDA ScaledJob - https://keda.sh/docs/latest/reference/scaledjob-spec/#scalingstrategy
1186-
strategy: default
1186+
strategy: "accurate"
11871187
# -- Number of Completed jobs should be kept
11881188
successfulJobsHistoryLimit: 0
11891189
# -- Number of Failed jobs should be kept (for troubleshooting purposes)

tests/SeleniumTests/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
TEST_MULTIPLE_PLATFORMS = os.environ.get('TEST_MULTIPLE_PLATFORMS', 'false').lower() == 'true'
3838
TEST_MULTIPLE_PLATFORMS_RELAY = os.environ.get('TEST_MULTIPLE_PLATFORMS_RELAY', 'false').lower() == 'true'
3939
TEST_MULTIPLE_VERSIONS_EXPLICIT = os.environ.get('TEST_MULTIPLE_VERSIONS_EXPLICIT', 'true').lower() == 'true'
40-
LIST_CHROMIUM_VERSIONS = ['140.0', '139.0', '138.0', '137.0', '136.0', '135.0', '134.0']
41-
LIST_FIREFOX_VERSIONS = ['142.0', '141.0', '140.0', '139.0', '138.0', '137.0', '136.0']
40+
LIST_CHROMIUM_VERSIONS = ['147.0', '146.0', '145.0', '144.0']
41+
LIST_FIREFOX_VERSIONS = ['147.0', '146.0', '145.0', '144.0']
4242
LIST_PLATFORMS = ['Linux', None, 'Windows 11']
4343
TEST_SITE = os.environ.get('TEST_SITE', 'the-internet.herokuapp.com')
44-
RELAY_SELENIUM_VERSION = "4.35.0"
44+
RELAY_SELENIUM_VERSION = "4.42.0"
4545

4646
if not TEST_MULTIPLE_VERSIONS_EXPLICIT:
4747
LIST_CHROMIUM_VERSIONS.append(None)

tests/charts/make/chart_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ WEB_DRIVER_WAIT_TIMEOUT=${WEB_DRIVER_WAIT_TIMEOUT:-120}
2525
AUTOSCALING_POLL_INTERVAL=${AUTOSCALING_POLL_INTERVAL:-20}
2626
AUTOSCALING_COOLDOWN_PERIOD=${AUTOSCALING_COOLDOWN_PERIOD:-"1800"}
2727
ENABLE_VIDEO_RECORDER=${ENABLE_VIDEO_RECORDER:-"true"}
28-
SCALING_STRATEGY=${SCALING_STRATEGY:-"default"}
28+
SCALING_STRATEGY=${SCALING_STRATEGY:-"accurate"}
2929
SKIP_CLEANUP=${SKIP_CLEANUP:-"true"} # For debugging purposes, retain the cluster after the test run
3030
CHART_CERT_PATH=${CHART_CERT_PATH:-"${CHART_PATH}/certs/tls.crt"}
3131
SSL_CERT_DIR=${SSL_CERT_DIR:-"/etc/ssl/certs"}

0 commit comments

Comments
 (0)