Skip to content

Commit e0a7d63

Browse files
chore(deps): update helm release keda to v2.16.0 (#2459)
* chore(deps): update helm release keda to v2.16.0 * Update to use KEDA core release 2.16.0 Signed-off-by: Viet Nguyen Duc <[email protected]> --------- Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent d2c56dd commit e0a7d63

File tree

5 files changed

+24
-39
lines changed

5 files changed

+24
-39
lines changed

Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ PLATFORMS := $(or $(PLATFORMS),$(shell echo $$PLATFORMS),$(CURRENT_PLATFORM))
2626
SEL_PASSWD := $(or $(SEL_PASSWD),$(SEL_PASSWD),secret)
2727
CHROMIUM_VERSION := $(or $(CHROMIUM_VERSION),$(CHROMIUM_VERSION),latest)
2828
SBOM_OUTPUT := $(or $(SBOM_OUTPUT),$(SBOM_OUTPUT),package_versions.txt)
29-
KEDA_TAG_PREV_VERSION := $(or $(KEDA_TAG_PREV_VERSION),$(KEDA_TAG_PREV_VERSION),2.15.1-selenium-grid)
30-
KEDA_TAG_VERSION := $(or $(KEDA_TAG_VERSION),$(KEDA_TAG_VERSION),2.15.1-selenium-grid)
29+
KEDA_TAG_PREV_VERSION := $(or $(KEDA_TAG_PREV_VERSION),$(KEDA_TAG_PREV_VERSION),2.16.0-selenium-grid)
30+
KEDA_TAG_VERSION := $(or $(KEDA_TAG_VERSION),$(KEDA_TAG_VERSION),2.16.0-selenium-grid)
3131
KEDA_BASED_NAME := $(or $(KEDA_BASED_NAME),$(KEDA_BASED_NAME),ndviet)
32-
KEDA_BASED_TAG := $(or $(KEDA_BASED_TAG),$(KEDA_BASED_TAG),2.15.1-selenium-grid-20241017)
32+
KEDA_BASED_TAG := $(or $(KEDA_BASED_TAG),$(KEDA_BASED_TAG),2.16.0-selenium-grid)
3333

3434
all: hub \
3535
distributor \
@@ -352,7 +352,7 @@ tag_latest:
352352
docker tag $(NAME)/standalone-docker:$(TAG_VERSION) $(NAME)/standalone-docker:latest
353353
docker tag $(NAME)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) $(NAME)/video:latest
354354

355-
release_latest: release_grid_scaler_latest
355+
release_latest:
356356
docker push $(NAME)/base:latest
357357
docker push $(NAME)/hub:latest
358358
docker push $(NAME)/distributor:latest
@@ -397,7 +397,7 @@ tag_nightly:
397397
docker tag $(NAME)/standalone-docker:$(TAG_VERSION) $(NAME)/standalone-docker:nightly
398398
docker tag $(NAME)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) $(NAME)/video:nightly
399399

400-
release_nightly: release_grid_scaler_nightly
400+
release_nightly:
401401
docker push $(NAME)/base:nightly
402402
docker push $(NAME)/hub:nightly
403403
docker push $(NAME)/distributor:nightly
@@ -477,7 +477,7 @@ tag_major_minor:
477477
docker tag $(NAME)/standalone-firefox:$(TAG_VERSION) $(NAME)/standalone-firefox:$(MAJOR_MINOR_PATCH)
478478
docker tag $(NAME)/standalone-docker:$(TAG_VERSION) $(NAME)/standalone-docker:$(MAJOR_MINOR_PATCH)
479479

480-
release: tag_major_minor release_grid_scaler
480+
release: tag_major_minor
481481
@if ! docker images $(NAME)/base | awk '{ print $$2 }' | grep -q -F $(TAG_VERSION); then echo "$(NAME)/base version $(TAG_VERSION) is not yet built. Please run 'make build'"; false; fi
482482
@if ! docker images $(NAME)/hub | awk '{ print $$2 }' | grep -q -F $(TAG_VERSION); then echo "$(NAME)/hub version $(TAG_VERSION) is not yet built. Please run 'make build'"; false; fi
483483
@if ! docker images $(NAME)/distributor | awk '{ print $$2 }' | grep -q -F $(TAG_VERSION); then echo "$(NAME)/distributor version $(TAG_VERSION) is not yet built. Please run 'make build'"; false; fi

charts/selenium-grid/CONFIGURATION.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
1919
| Repository | Name | Version |
2020
|------------|------|---------|
2121
| https://jaegertracing.github.io/helm-charts | jaeger | 3.3.1 |
22-
| https://kedacore.github.io/charts | keda | 2.15.2 |
22+
| https://kedacore.github.io/charts | keda | 2.16.0 |
2323
| https://kubernetes.github.io/ingress-nginx | ingress-nginx | 4.11.3 |
2424
| https://prometheus-community.github.io/helm-charts | kube-prometheus-stack | 65.2.0 |
2525

@@ -177,7 +177,7 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
177177
| components.router.nodePort | int | `30444` | Router expose NodePort |
178178
| components.router.startupProbe | object | `{"enabled":true,"failureThreshold":10,"initialDelaySeconds":5,"path":"/readyz","periodSeconds":10,"successThreshold":1,"timeoutSeconds":10}` | Startup probe settings |
179179
| components.router.readinessProbe | object | `{"enabled":true,"failureThreshold":10,"initialDelaySeconds":12,"path":"/readyz","periodSeconds":10,"successThreshold":1,"timeoutSeconds":10}` | Readiness probe settings |
180-
| components.router.livenessProbe | object | `{"enabled":true,"failureThreshold":10,"initialDelaySeconds":10,"path":"/readyz","periodSeconds":10,"successThreshold":1,"timeoutSeconds":10}` | Liveness probe settings |
180+
| components.router.livenessProbe | object | `{"enabled":true,"failureThreshold":30,"initialDelaySeconds":60,"path":"/readyz","periodSeconds":60,"successThreshold":1,"timeoutSeconds":60}` | Liveness probe settings |
181181
| components.router.resources | object | `{}` | Resources for router container |
182182
| components.router.securityContext | object | `{}` | SecurityContext for router container |
183183
| components.router.serviceType | string | `"ClusterIP"` | Kubernetes service type (see https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) |
@@ -199,7 +199,7 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
199199
| components.distributor.nodePort | int | `30553` | Distributor expose NodePort |
200200
| components.distributor.startupProbe | object | `{"enabled":true,"failureThreshold":10,"initialDelaySeconds":5,"path":"/readyz","periodSeconds":10,"successThreshold":1,"timeoutSeconds":10}` | Startup probe settings |
201201
| components.distributor.readinessProbe | object | `{"enabled":true,"failureThreshold":10,"initialDelaySeconds":12,"path":"/readyz","periodSeconds":10,"successThreshold":1,"timeoutSeconds":10}` | Readiness probe settings |
202-
| components.distributor.livenessProbe | object | `{"enabled":true,"failureThreshold":10,"initialDelaySeconds":10,"path":"/readyz","periodSeconds":10,"successThreshold":1,"timeoutSeconds":10}` | Liveness probe settings |
202+
| components.distributor.livenessProbe | object | `{"enabled":true,"failureThreshold":30,"initialDelaySeconds":60,"path":"/readyz","periodSeconds":60,"successThreshold":1,"timeoutSeconds":60}` | Liveness probe settings |
203203
| components.distributor.resources | object | `{}` | Resources for Distributor container |
204204
| components.distributor.securityContext | object | `{}` | SecurityContext for Distributor container |
205205
| components.distributor.serviceType | string | `"ClusterIP"` | Kubernetes service type (see https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) |
@@ -283,7 +283,7 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
283283
| hub.nodePort | int | `31444` | Selenium Hub expose NodePort |
284284
| hub.startupProbe | object | `{"enabled":true,"failureThreshold":10,"initialDelaySeconds":5,"path":"/readyz","periodSeconds":10,"successThreshold":1,"timeoutSeconds":10}` | Startup probe settings |
285285
| hub.readinessProbe | object | `{"enabled":true,"failureThreshold":10,"initialDelaySeconds":12,"path":"/readyz","periodSeconds":10,"successThreshold":1,"timeoutSeconds":10}` | Readiness probe settings |
286-
| hub.livenessProbe | object | `{"enabled":true,"failureThreshold":10,"initialDelaySeconds":10,"path":"/readyz","periodSeconds":10,"successThreshold":1,"timeoutSeconds":10}` | Liveness probe settings |
286+
| hub.livenessProbe | object | `{"enabled":true,"failureThreshold":30,"initialDelaySeconds":60,"path":"/readyz","periodSeconds":60,"successThreshold":1,"timeoutSeconds":60}` | Liveness probe settings |
287287
| hub.subPath | string | `""` | Custom sub path for the hub deployment |
288288
| hub.extraEnvironmentVariables | string | `nil` | Custom environment variables for selenium-hub |
289289
| hub.extraEnvFrom | string | `nil` | Custom environment variables by sourcing entire configMap, Secret, etc. for selenium-hub |
@@ -577,7 +577,6 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
577577
| videoRecorder.extraVolumes | list | `[]` | Extra volumes for video recorder pod |
578578
| videoRecorder.s3 | object | `{"args":[],"command":[],"extraEnvironmentVariables":null,"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" |
579579
| customLabels | object | `{}` | Custom labels for k8s resources |
580-
| keda.image | object | `{"keda":{"registry":"selenium","repository":"keda","tag":"2.15.1-selenium-grid-20241101"},"metricsApiServer":{"registry":"selenium","repository":"keda-metrics-apiserver","tag":"2.15.1-selenium-grid-20241101"},"webhooks":{"registry":"selenium","repository":"keda-admission-webhooks","tag":"2.15.1-selenium-grid-20241101"}}` | Specify image for KEDA components |
581580
| keda.additionalAnnotations | string | `nil` | Annotations for KEDA resources |
582581
| keda.http.timeout | int | `60000` | |
583582
| keda.webhooks | object | `{"enabled":false}` | Enable KEDA admission webhooks component |

charts/selenium-grid/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ appVersion: 4.26.0-20241101
77
icon: https://github.com/SeleniumHQ/docker-selenium/raw/trunk/logo.png
88
dependencies:
99
- repository: https://kedacore.github.io/charts
10-
version: 2.15.2
10+
version: 2.16.0
1111
name: keda
1212
condition: autoscaling.enabled, keda.enabled
1313
- repository: https://kubernetes.github.io/ingress-nginx

charts/selenium-grid/values.yaml

+12-26
Original file line numberDiff line numberDiff line change
@@ -424,10 +424,10 @@ components:
424424
livenessProbe:
425425
enabled: true
426426
path: /readyz
427-
initialDelaySeconds: 10
428-
failureThreshold: 10
429-
timeoutSeconds: 10
430-
periodSeconds: 10
427+
initialDelaySeconds: 60
428+
failureThreshold: 30
429+
timeoutSeconds: 60
430+
periodSeconds: 60
431431
successThreshold: 1
432432
# -- Resources for router container
433433
resources: {}
@@ -494,10 +494,10 @@ components:
494494
livenessProbe:
495495
enabled: true
496496
path: /readyz
497-
initialDelaySeconds: 10
498-
failureThreshold: 10
499-
timeoutSeconds: 10
500-
periodSeconds: 10
497+
initialDelaySeconds: 60
498+
failureThreshold: 30
499+
timeoutSeconds: 60
500+
periodSeconds: 60
501501
successThreshold: 1
502502
# -- Resources for Distributor container
503503
resources: {}
@@ -716,10 +716,10 @@ hub:
716716
livenessProbe:
717717
enabled: true
718718
path: /readyz
719-
initialDelaySeconds: 10
720-
failureThreshold: 10
721-
timeoutSeconds: 10
722-
periodSeconds: 10
719+
initialDelaySeconds: 60
720+
failureThreshold: 30
721+
timeoutSeconds: 60
722+
periodSeconds: 60
723723
successThreshold: 1
724724
# -- Custom sub path for the hub deployment
725725
subPath: ""
@@ -1768,20 +1768,6 @@ customLabels: {}
17681768
# Configuration for dependency chart keda
17691769
keda:
17701770
# enabled: false
1771-
# -- Specify image for KEDA components
1772-
image:
1773-
keda:
1774-
registry: selenium
1775-
repository: keda
1776-
tag: "2.15.1-selenium-grid-20241101"
1777-
metricsApiServer:
1778-
registry: selenium
1779-
repository: keda-metrics-apiserver
1780-
tag: "2.15.1-selenium-grid-20241101"
1781-
webhooks:
1782-
registry: selenium
1783-
repository: keda-admission-webhooks
1784-
tag: "2.15.1-selenium-grid-20241101"
17851771
# -- Annotations for KEDA resources
17861772
additionalAnnotations:
17871773
http:

tests/charts/make/chart_test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ MAX_SESSIONS_CHROME=${MAX_SESSIONS_CHROME:-"1"}
5555
MAX_SESSIONS_FIREFOX=${MAX_SESSIONS_FIREFOX:-"1"}
5656
MAX_SESSIONS_EDGE=${MAX_SESSIONS_EDGE:-"1"}
5757
TEST_NAME_OVERRIDE=${TEST_NAME_OVERRIDE:-"false"}
58-
TEST_PATCHED_KEDA=${TEST_PATCHED_KEDA:-"true"}
58+
TEST_PATCHED_KEDA=${TEST_PATCHED_KEDA:-"false"}
5959
BASIC_AUTH_EMBEDDED_URL=${BASIC_AUTH_EMBEDDED_URL:-"false"}
6060
SELENIUM_GRID_MONITORING=${SELENIUM_GRID_MONITORING:-"true"}
6161
TEST_EXISTING_PTS=${TEST_EXISTING_PTS:-"false"}

0 commit comments

Comments
 (0)