Merge pull request #1563 from element-hq/bbz/rename-external-redis-properties-in-values-files

Replace usage of redis in components' CI values files with redisOrValkey

Author: benbz

.github/element-docs-words.txt

@@ -51,5 +51,6 @@ templatable
 threepids
 towncrier
 Traefik
+Valkey
 Wifi
 zizmor

charts/matrix-stack/ci/example-default-enabled-components-checkov-values.yaml

@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-only
 
-# source_fragments: deployment-markers-checkov.yaml deployment-markers-minimal.yaml element-admin-checkov.yaml element-admin-minimal.yaml element-web-checkov.yaml element-web-minimal.yaml haproxy-checkov.yaml init-secrets-checkov.yaml init-secrets-minimal.yaml matrix-authentication-service-checkov.yaml matrix-authentication-service-minimal.yaml matrix-rtc-checkov.yaml matrix-rtc-minimal.yaml postgres-checkov.yaml postgres-minimal.yaml redis-checkov.yaml server-name.yaml synapse-checkov.yaml synapse-minimal.yaml well-known-minimal.yaml
+# source_fragments: deployment-markers-checkov.yaml deployment-markers-minimal.yaml element-admin-checkov.yaml element-admin-minimal.yaml element-web-checkov.yaml element-web-minimal.yaml haproxy-checkov.yaml init-secrets-checkov.yaml init-secrets-minimal.yaml matrix-authentication-service-checkov.yaml matrix-authentication-service-minimal.yaml matrix-rtc-checkov.yaml matrix-rtc-minimal.yaml postgres-checkov.yaml postgres-minimal.yaml server-name.yaml synapse-checkov.yaml synapse-minimal.yaml valkey-checkov.yaml well-known-minimal.yaml
 # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values
 
 # wellKnownDelegation don't have any required properties to be set and defaults to enabled
@@ -62,11 +62,6 @@ postgres:
     checkov.io/skip1: CKV_K8S_11=We deliberately don't set CPU limits. Pod is BestEffort not Guaranteed
     checkov.io/skip2: CKV_K8S_43=No digests
     checkov.io/skip3: CKV2_K8S_6=No network policy yet
-redis:
-  annotations:
-    checkov.io/skip1: CKV_K8S_11=We deliberately don't set CPU limits. Pod is BestEffort not Guaranteed
-    checkov.io/skip2: CKV_K8S_43=No digests
-    checkov.io/skip3: CKV2_K8S_6=No network policy yet
 serverName: ess.localhost
 synapse:
   annotations:
@@ -80,3 +75,8 @@ synapse:
       checkov.io/skip3: CKV2_K8S_6=No network policy yet
   ingress:
     host: synapse.ess.localhost
+valkey:
+  annotations:
+    checkov.io/skip1: CKV_K8S_11=We deliberately don't set CPU limits. Pod is BestEffort not Guaranteed
+    checkov.io/skip2: CKV_K8S_43=No digests
+    checkov.io/skip3: CKV2_K8S_6=No network policy yet

…s/hookshot-redis-secrets-externally.yaml …hot-redis-valkey-secrets-externally.yamlcharts/matrix-stack/ci/fragments/hookshot-redis-secrets-externally.yaml renamed to charts/matrix-stack/ci/fragments/hookshot-redis-valkey-secrets-externally.yaml charts/matrix-stack/ci/fragments/hookshot-redis-secrets-externally.yaml renamed to charts/matrix-stack/ci/fragments/hookshot-redis-valkey-secrets-externally.yaml

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 hookshot:
-  redis:
+  redisOrValkey:
     password:
-      secret: "{{ $.Release.Name }}-redis-credentials"
+      secret: "{{ $.Release.Name }}-redis-valkey-credentials"
       secretKey: "password"

…ents/hookshot-redis-secrets-in-helm.yaml …okshot-redis-valkey-secrets-in-helm.yamlcharts/matrix-stack/ci/fragments/hookshot-redis-secrets-in-helm.yaml renamed to charts/matrix-stack/ci/fragments/hookshot-redis-valkey-secrets-in-helm.yaml charts/matrix-stack/ci/fragments/hookshot-redis-secrets-in-helm.yaml renamed to charts/matrix-stack/ci/fragments/hookshot-redis-valkey-secrets-in-helm.yaml

@@ -3,6 +3,6 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 hookshot:
-  redis:
+  redisOrValkey:
     password:
-      value: "test-redis-password"
+      value: "test-redis-valkey-password"

…x-stack/ci/fragments/hookshot-redis.yaml …/ci/fragments/hookshot-redis-valkey.yamlcharts/matrix-stack/ci/fragments/hookshot-redis.yaml renamed to charts/matrix-stack/ci/fragments/hookshot-redis-valkey.yaml charts/matrix-stack/ci/fragments/hookshot-redis.yaml renamed to charts/matrix-stack/ci/fragments/hookshot-redis-valkey.yaml

@@ -3,6 +3,6 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 hookshot:
-  redis:
-    host: "external-redis.example.com"
+  redisOrValkey:
+    host: "external-redis-or-valkey.example.com"
     port: 6379

charts/matrix-stack/ci/fragments/matrix-rtc-redis-secrets-externally.yaml

@@ -0,0 +1,11 @@
+# Copyright 2026 Element Creations Ltd
+#
+# SPDX-License-Identifier: AGPL-3.0-only
+
+matrixRTC:
+  # The authoriser doesn't yet support an external Redis / Valkey
+  sfu:
+    redisOrValkey:
+      password:
+        secret: "{{ $.Release.Name }}-redis-valkey-credentials"
+        secretKey: "password"

charts/matrix-stack/ci/fragments/matrix-rtc-redis-secrets-in-helm.yaml

@@ -0,0 +1,10 @@
+# Copyright 2026 Element Creations Ltd
+#
+# SPDX-License-Identifier: AGPL-3.0-only
+
+matrixRTC:
+  # The authoriser doesn't yet support an external Redis / Valkey
+  sfu:
+    redisOrValkey:
+      password:
+        value: "test-redis-valkey-password"

charts/matrix-stack/ci/fragments/matrix-rtc-redis-valkey-secrets-externally.yaml

@@ -0,0 +1,10 @@
+# Copyright 2026 Element Creations Ltd
+#
+# SPDX-License-Identifier: AGPL-3.0-only
+
+matrixRTC:
+  # The authoriser doesn't yet support an external Redis / Valkey
+  sfu:
+    redisOrValkey:
+      host: "external-redis-or-valkey.example.com"
+      port: 6379