K8s: Migrate subchart Redis to cloudpirates/redis from bitnami/redis (#3148)

Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
[skip ci]

Author: VietND96

Makefile

@@ -31,10 +31,10 @@ CHROMIUM_VERSION := $(or $(CHROMIUM_VERSION),$(CHROMIUM_VERSION),latest)
 FIREFOX_DOWNLOAD_URL := $(or $(FIREFOX_DOWNLOAD_URL),$(FIREFOX_DOWNLOAD_URL),)
 SBOM_OUTPUT := $(or $(SBOM_OUTPUT),$(SBOM_OUTPUT),package_versions.txt)
 KEDA_TAG_PREV_VERSION := $(or $(KEDA_TAG_PREV_VERSION),$(KEDA_TAG_PREV_VERSION),2.19.0)
-KEDA_CORE_VERSION := $(or $(KEDA_CORE_VERSION),$(KEDA_CORE_VERSION),2.19.0)
-KEDA_TAG_VERSION := $(or $(KEDA_TAG_VERSION),$(KEDA_TAG_VERSION),2.19.0)
+KEDA_CORE_VERSION := $(or $(KEDA_CORE_VERSION),$(KEDA_CORE_VERSION),2.20.1)
+KEDA_TAG_VERSION := $(or $(KEDA_TAG_VERSION),$(KEDA_TAG_VERSION),2.20.1)
 KEDA_BASED_NAME := $(or $(KEDA_BASED_NAME),$(KEDA_BASED_NAME),kedacore)
-KEDA_BASED_TAG := $(or $(KEDA_BASED_TAG),$(KEDA_BASED_TAG),2.19.0)
+KEDA_BASED_TAG := $(or $(KEDA_BASED_TAG),$(KEDA_BASED_TAG),2.20.1)
 TEST_PATCHED_KEDA := $(or $(TEST_PATCHED_KEDA),$(TEST_PATCHED_KEDA),false)
 TRACING_EXPORTER_ENDPOINT := $(or $(TRACING_EXPORTER_ENDPOINT),$(TRACING_EXPORTER_ENDPOINT),http://\$$KUBERNETES_NODE_HOST_IP:4317)
 GHCR_NAMESPACE := $(or $(GHCR_NAMESPACE),$(GHCR_NAMESPACE),ghcr.io/seleniumhq)
@@ -488,25 +488,22 @@ tag_and_push_browser_images_ghcr:
 		node-firefox standalone-firefox; do \
 		docker images --format "{{.Tag}}" "$(NAME)/$$image" | grep -v "^<none>$$" | while IFS= read -r tag; do \
 		docker buildx imagetools create \
-		--tag $(GHCR_NAMESPACE)/$$image:$$tag \
-		docker.io/$(NAME)/$$image:$$tag ; \
+		--tag $(GHCR_NAMESPACE)/$$image:$$tag docker.io/$(NAME)/$$image:$$tag ; \
 	done ; \
 	done
 
 mirror_browser_images_ghcr:
 	for image in node-$(BROWSER_NAME) standalone-$(BROWSER_NAME); do \
 		docker images --format "{{.Tag}}" "$(NAME)/$$image" | grep -v "^<none>$$" | while IFS= read -r tag; do \
 		docker buildx imagetools create \
-		--tag $(GHCR_NAMESPACE)/$$image:$$tag \
-		docker.io/$(NAME)/$$image:$$tag ; \
+		--tag $(GHCR_NAMESPACE)/$$image:$$tag docker.io/$(NAME)/$$image:$$tag ; \
 	done ; \
 	done
 
 mirror_browser_channel_image_ghcr:
 	for image in node-$(BROWSER_NAME) standalone-$(BROWSER_NAME); do \
 		docker buildx imagetools create \
-		--tag $(GHCR_NAMESPACE)/$$image:$(BROWSER_TAG) \
-		docker.io/$(NAME)/$$image:$(BROWSER_TAG) ; \
+		--tag $(GHCR_NAMESPACE)/$$image:$(BROWSER_TAG) docker.io/$(NAME)/$$image:$(BROWSER_TAG) ; \
 	done
 
 tag_ffmpeg_latest:
@@ -554,8 +551,7 @@ release_ffmpeg_latest:
 release_ffmpeg_ghcr_latest:
 	for tag in latest $(FFMPEG_VERSION) $(FFMPEG_VERSION)-$(BUILD_DATE); do \
 		docker buildx imagetools create \
-		--tag $(GHCR_NAMESPACE)/ffmpeg:$$tag \
-		docker.io/$(NAME)/ffmpeg:$$tag ; \
+		--tag $(GHCR_NAMESPACE)/ffmpeg:$$tag docker.io/$(NAME)/ffmpeg:$$tag ; \
 	done
 
 release_latest:
@@ -593,8 +589,7 @@ release_ghcr_latest:
 		standalone-edge standalone-firefox standalone-docker \
 		standalone-kubernetes standalone-all-browsers video; do \
 		docker buildx imagetools create \
-		--tag $(GHCR_NAMESPACE)/$$image:latest \
-		docker.io/$(NAME)/$$image:latest ; \
+		--tag $(GHCR_NAMESPACE)/$$image:latest docker.io/$(NAME)/$$image:latest ; \
 	done
 
 generate_latest_sbom:
@@ -668,8 +663,7 @@ release_ghcr_nightly:
 		standalone-edge standalone-firefox standalone-docker \
 		standalone-kubernetes standalone-all-browsers video; do \
 		docker buildx imagetools create \
-		--tag $(GHCR_NAMESPACE)/$$image:nightly \
-		docker.io/$(NAME)/$$image:nightly ; \
+		--tag $(GHCR_NAMESPACE)/$$image:nightly docker.io/$(NAME)/$$image:nightly ; \
 	done
 
 generate_nightly_sbom:
@@ -881,13 +875,11 @@ release_ghcr:
 		standalone-kubernetes standalone-all-browsers; do \
 		for tag in $(TAG_VERSION) $(MAJOR) $(MAJOR).$(MINOR) $(MAJOR_MINOR_PATCH); do \
 			docker buildx imagetools create \
-			--tag $(GHCR_NAMESPACE)/$$image:$$tag \
-			docker.io/$(NAME)/$$image:$$tag ; \
+			--tag $(GHCR_NAMESPACE)/$$image:$$tag docker.io/$(NAME)/$$image:$$tag ; \
 		done ; \
 	done
 	docker buildx imagetools create \
-	  --tag $(GHCR_NAMESPACE)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) \
-	  docker.io/$(NAME)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE)
+	  --tag $(GHCR_NAMESPACE)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) docker.io/$(NAME)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE)
 
 start_test_site:
 	@docker rm -f the-internet 2>/dev/null || true

charts/selenium-grid/CONFIGURATION.md

@@ -19,9 +19,9 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
 | Repository | Name | Version |
 |------------|------|---------|
 | https://charts.bitnami.com/bitnami | postgresql | ^18.0.0 |
-| https://charts.bitnami.com/bitnami | redis | ^25.0.0 |
+| https://cloudpirates-io.github.io/helm-charts | redis | ^0.30.0 |
 | https://jaegertracing.github.io/helm-charts | jaeger | ^4.0.0 |
-| https://kedacore.github.io/charts | keda | 2.19 |
+| https://kedacore.github.io/charts | keda | ^2.20.0 |
 | https://prometheus-community.github.io/helm-charts | kube-prometheus-stack | ^86.0.0 |
 | https://traefik.github.io/charts | traefik | ^40.0.0 |
 
@@ -232,10 +232,10 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
 | components.distributor.imagePullSecret | string | `""` | Image pull secret (see https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/) |
 | components.distributor.newSessionThreadPoolSize | string | `nil` | Configure fixed-sized thread pool for the Distributor to create new sessions as it consumes new session requests from the queue |
 | components.distributor.slotSelectorStrategy | string | `""` | Full class name of non-default slot selector. This is used to select a slot in a Node once the Node has been matched |
-| components.distributor.externalDatastore | object | `{"backend":"redis","enabled":false,"redis":{"implementation":"org.openqa.selenium.grid.distributor.redis.RedisBackedDistributor","url":"redis://{{ $.Release.Name }}-redis-master:6379"}}` | Configure external datastore for Distributor. When enabled, all replicas share state through the backend (node registrations, slot reservations, health-check coordination), allowing zero-downtime rolling restarts. |
+| components.distributor.externalDatastore | object | `{"backend":"redis","enabled":false,"redis":{"implementation":"org.openqa.selenium.grid.distributor.redis.RedisBackedDistributor","url":"redis://{{ $.Release.Name }}-redis:6379"}}` | Configure external datastore for Distributor. When enabled, all replicas share state through the backend (node registrations, slot reservations, health-check coordination), allowing zero-downtime rolling restarts. |
 | components.distributor.externalDatastore.enabled | bool | `false` | Enable external datastore for Distributor |
 | components.distributor.externalDatastore.backend | string | `"redis"` | Backend for external datastore (supported: redis) |
-| components.distributor.externalDatastore.redis | object | `{"implementation":"org.openqa.selenium.grid.distributor.redis.RedisBackedDistributor","url":"redis://{{ $.Release.Name }}-redis-master:6379"}` | Configure Redis backed Distributor |
+| components.distributor.externalDatastore.redis | object | `{"implementation":"org.openqa.selenium.grid.distributor.redis.RedisBackedDistributor","url":"redis://{{ $.Release.Name }}-redis:6379"}` | Configure Redis backed Distributor |
 | components.distributor.extraEnvironmentVariables | list | `[]` | Specify extra environment variables for Distributor |
 | components.distributor.extraEnvFrom | list | `[]` | Specify extra environment variables from ConfigMap and Secret for Distributor |
 | components.distributor.affinity | object | `{}` | Specify affinity for distributor pods, this overwrites global.seleniumGrid.affinity parameter |
@@ -315,7 +315,7 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
 | components.sessionMap.externalDatastore.enabled | bool | `false` | Enable external datastore for Session Map |
 | components.sessionMap.externalDatastore.backend | string | `"redis"` | Backend for external datastore (supported: postgresql, redis). Details for each backend are described below config key |
 | components.sessionMap.externalDatastore.postgresql | object | `{"implementation":"org.openqa.selenium.grid.sessionmap.jdbc.JdbcBackedSessionMap","jdbcPassword":"seluser","jdbcUrl":"jdbc:postgresql://{{ $.Release.Name }}-postgresql:5432/selenium_sessions","jdbcUser":"seluser"}` | Configure database backed Session Map (https://www.selenium.dev/documentation/grid/advanced_features/external_datastore/#database-backed-session-map) |
-| components.sessionMap.externalDatastore.redis | object | `{"hostname":"{{ $.Release.Name }}-redis-master","implementation":"org.openqa.selenium.grid.sessionmap.redis.RedisBackedSessionMap","port":"6379","scheme":"redis"}` | Configure Redis backed Session Map (https://www.selenium.dev/documentation/grid/advanced_features/external_datastore/#redis-backed-session-map) |
+| components.sessionMap.externalDatastore.redis | object | `{"hostname":"{{ $.Release.Name }}-redis","implementation":"org.openqa.selenium.grid.sessionmap.redis.RedisBackedSessionMap","port":"6379","scheme":"redis"}` | Configure Redis backed Session Map (https://www.selenium.dev/documentation/grid/advanced_features/external_datastore/#redis-backed-session-map) |
 | components.sessionQueue.imageRegistry | string | `nil` | Registry to pull the image (this overwrites global.seleniumGrid.imageRegistry parameter) |
 | components.sessionQueue.imageName | string | `"session-queue"` | Session Queue image name |
 | components.sessionQueue.imageTag | string | `nil` | Session Queue image tag (this overwrites global.seleniumGrid.imageTag parameter) |
@@ -795,7 +795,6 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
 | postgresql.auth | object | `{"database":"selenium_sessions","password":"seluser","username":"seluser"}` | Authentication should be aligned with config in session map |
 | postgresql.primary.initdb.scripts | object | `{"init.sql":"CREATE TABLE IF NOT EXISTS sessions_map(\n  session_ids varchar(256),\n  session_caps text,\n  session_uri varchar(256),\n  session_stereotype text,\n  session_start varchar(256)\n);\n"}` | Initdb scripts for PostgreSQL to create sessions_map table |
 | redis.enabled | bool | `false` | Enable to install Redis along with Grid |
-| redis.image.repository | string | `"bitnamilegacy/redis"` |  |
 | redis.architecture | string | `"standalone"` | Setup architecture |
 | redis.auth.enabled | bool | `false` | Disable authentication due to implementation still not supporting it |
 

charts/selenium-grid/Chart.yaml

@@ -7,7 +7,7 @@ appVersion: 4.44.0-20260505
 icon: https://github.com/SeleniumHQ/docker-selenium/raw/trunk/logo.png
 dependencies:
 - repository: https://kedacore.github.io/charts
-  version: 2.19
+  version: ^2.20.0
   name: keda
   condition: autoscaling.enabled, keda.enabled
 - repository: https://traefik.github.io/charts
@@ -26,8 +26,8 @@ dependencies:
   version: ^18.0.0
   name: postgresql
   condition: postgresql.enabled
-- repository: https://charts.bitnami.com/bitnami
-  version: ^25.0.0
+- repository: https://cloudpirates-io.github.io/helm-charts
+  version: ^0.30.0
   name: redis
   condition: redis.enabled
 maintainers:

charts/selenium-grid/values.yaml

@@ -577,7 +577,7 @@ components:
       # -- Configure Redis backed Distributor
       redis:
         implementation: "org.openqa.selenium.grid.distributor.redis.RedisBackedDistributor"
-        url: "redis://{{ $.Release.Name }}-redis-master:6379"
+        url: "redis://{{ $.Release.Name }}-redis:6379"
     # -- Specify extra environment variables for Distributor
     extraEnvironmentVariables: []
     # -- Specify extra environment variables from ConfigMap and Secret for Distributor
@@ -794,7 +794,7 @@ components:
       redis:
         scheme: "redis"
         implementation: "org.openqa.selenium.grid.sessionmap.redis.RedisBackedSessionMap"
-        hostname: "{{ $.Release.Name }}-redis-master"
+        hostname: "{{ $.Release.Name }}-redis"
         port: "6379"
 
   # Configuration for Session Queue component
@@ -2371,12 +2371,10 @@ postgresql:
             session_start varchar(256)
           );
 
-# Configuration for dependency chart Redis (README: https://artifacthub.io/packages/helm/bitnami/redis)
+# Configuration for dependency chart Redis (README: https://artifacthub.io/packages/helm/cloudpirates/redis)
 redis:
   # -- Enable to install Redis along with Grid
   enabled: false
-  image:
-    repository: bitnamilegacy/redis
   # -- Setup architecture
   architecture: standalone
   auth:

tests/charts/config/ct.yaml

@@ -9,6 +9,7 @@ chart-repos:
   - jaegertracing=https://jaegertracing.github.io/helm-charts
   - prometheusCommunity=https://prometheus-community.github.io/helm-charts
   - bitnami=https://charts.bitnami.com/bitnami
+  - cloudpirates=https://cloudpirates-io.github.io/helm-charts
 upgrade: false
 helm-extra-args: --timeout 600s
 check-version-increment: false