Skip to content

Commit 30accb5

Browse files
committed
Merge remote-tracking branch 'origin/keda' into renovate/keda-update
2 parents 82a7aec + 7c24084 commit 30accb5

File tree

4 files changed

+27
-24
lines changed

4 files changed

+27
-24
lines changed

.keda/README.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,13 @@ 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/6570 (plan, v2.17.0)
52+
- ~~https://github.com/kedacore/keda/pull/6684 (merged, v2.17.0)~~
5353

54-
- https://github.com/kedacore/keda/pull/6536 (plan, v2.17.0)
54+
- ~~https://github.com/kedacore/keda/pull/6570 (merged, v2.17.0)~~
5555

56-
- https://github.com/kedacore/keda/pull/6477 (plan, v2.17.0)
56+
- ~~https://github.com/kedacore/keda/pull/6536 (merged, v2.17.0)~~
57+
58+
- ~~https://github.com/kedacore/keda/pull/6477 (merged, v2.17.0)~~
5759

5860
- ~~https://github.com/kedacore/keda/pull/6437 (merged, v2.16.1)~~
5961

@@ -63,11 +65,13 @@ You can involve to review and discuss the pull requests to help us early detect
6365

6466
[kedacore/keda-docs](https://github.com/kedacore/keda-docs)
6567

66-
- https://github.com/kedacore/keda-docs/pull/1542 (plan, v2.17.0)
68+
- ~~https://github.com/kedacore/keda-docs/pull/1560 (merged, v2.17.0)~~
69+
70+
- ~~https://github.com/kedacore/keda-docs/pull/1542 (merged, v2.17.0)~~
6771

68-
- https://github.com/kedacore/keda-docs/pull/1533 (plan, v2.17.0)
72+
- ~~https://github.com/kedacore/keda-docs/pull/1533 (merged, v2.17.0)~~
6973

70-
- https://github.com/kedacore/keda-docs/pull/1522 (plan, v2.17.0)
74+
- ~~https://github.com/kedacore/keda-docs/pull/1522 (merged, v2.17.0)~~
7175

7276
- ~~https://github.com/kedacore/keda-docs/pull/1515 (merged, v2.16.1)~~
7377

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ 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.16.1-selenium-grid)
34-
KEDA_CORE_VERSION := $(or $(KEDA_CORE_VERSION),$(KEDA_CORE_VERSION),2.16.1)
35-
KEDA_TAG_VERSION := $(or $(KEDA_TAG_VERSION),$(KEDA_TAG_VERSION),2.16.1-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)
3636
KEDA_BASED_NAME := $(or $(KEDA_BASED_NAME),$(KEDA_BASED_NAME),ndviet)
37-
KEDA_BASED_TAG := $(or $(KEDA_BASED_TAG),$(KEDA_BASED_TAG),2.16.1-selenium-grid-20250404)
38-
TEST_PATCHED_KEDA := $(or $(TEST_PATCHED_KEDA),$(TEST_PATCHED_KEDA),true)
37+
KEDA_BASED_TAG := $(or $(KEDA_BASED_TAG),$(KEDA_BASED_TAG),2.17.0-selenium-grid-20250407)
38+
TEST_PATCHED_KEDA := $(or $(TEST_PATCHED_KEDA),$(TEST_PATCHED_KEDA),false)
3939

4040
all: hub \
4141
distributor \

charts/selenium-grid/CONFIGURATION.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,6 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
678678
| videoRecorder.extraVolumes | list | `[]` | Extra volumes for video recorder pod |
679679
| videoRecorder.s3 | object | `{"args":[],"command":[],"extraEnvironmentVariables":[],"imageName":"aws-cli","imagePullPolicy":"IfNotPresent","imageRegistry":"bitnami","imageTag":"latest","securityContext":{"runAsUser":0}}` | Container spec for the uploader if above it is defined as "uploader.name: s3" |
680680
| customLabels | object | `{}` | Custom labels for k8s resources |
681-
| keda.image | object | `{"keda":{"registry":"selenium","repository":"keda","tag":"2.16.1-selenium-grid-20250323"},"metricsApiServer":{"registry":"selenium","repository":"keda-metrics-apiserver","tag":"2.16.1-selenium-grid-20250323"},"webhooks":{"registry":"selenium","repository":"keda-admission-webhooks","tag":"2.16.1-selenium-grid-20250323"}}` | Specify image for KEDA components |
682681
| keda.additionalAnnotations | string | `nil` | Annotations for KEDA resources |
683682
| keda.http.timeout | int | `60000` | |
684683
| keda.webhooks | object | `{"enabled":false}` | Enable KEDA admission webhooks component |

charts/selenium-grid/values.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2034,19 +2034,19 @@ customLabels: {}
20342034
keda:
20352035
# enabled: false
20362036
# -- Specify image for KEDA components
2037-
image:
2038-
keda:
2039-
registry: selenium
2040-
repository: keda
2041-
tag: "2.16.1-selenium-grid-20250323"
2042-
metricsApiServer:
2043-
registry: selenium
2044-
repository: keda-metrics-apiserver
2045-
tag: "2.16.1-selenium-grid-20250323"
2046-
webhooks:
2047-
registry: selenium
2048-
repository: keda-admission-webhooks
2049-
tag: "2.16.1-selenium-grid-20250323"
2037+
# image:
2038+
# keda:
2039+
# registry: selenium
2040+
# repository: keda
2041+
# tag: "2.16.1-selenium-grid-20250323"
2042+
# metricsApiServer:
2043+
# registry: selenium
2044+
# repository: keda-metrics-apiserver
2045+
# tag: "2.16.1-selenium-grid-20250323"
2046+
# webhooks:
2047+
# registry: selenium
2048+
# repository: keda-admission-webhooks
2049+
# tag: "2.16.1-selenium-grid-20250323"
20502050
# -- Annotations for KEDA resources
20512051
additionalAnnotations:
20522052
http:

0 commit comments

Comments
 (0)