Skip to content

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

Merged
benbz merged 1 commit into
bbz/rename-external-redis-propertiesfrom
bbz/rename-external-redis-properties-in-values-files
Sep 2, 2026
Merged

Replace usage of redis in components' CI values files with redisOrValkey#1563
benbz merged 1 commit into
bbz/rename-external-redis-propertiesfrom
bbz/rename-external-redis-properties-in-values-files

Conversation

@benbz

@benbz benbz commented Sep 2, 2026

Copy link
Copy Markdown
Member

Builds on !1562 and updates the CI values files to use the replacement property. (Again this should be a no-op in terms of the rendered manifests) The only changes should related to the changed details of the external Redis (hostname, base64 encoded password and/or referenced secret)

@benbz
benbz requested a review from a team as a code owner September 2, 2026 13:27
@github-actions

github-actions Bot commented Sep 2, 2026

Copy link
Copy Markdown

dyff of changes in rendered templates of CI manifests

Full contents of manifests and dyffs are available in https://github.com/element-hq/ess-helm/actions/runs/33637476629/artifacts/9849431994

hookshot-secrets-externally-values.yaml
@@ ConfigMap/ess-ci/release-name-hookshot - data.config-override.yaml @@
  bridge:
    domain: "ess.localhost"
    port: 9993
    bindAddress: "::"
  
  passFile: /secrets/release-name-hookshot-external-passkey/passfile
  
  cache:
-   redisUri: "redis://:${HOOKSHOT_REDIS_PASSWORD}@external-redis.example.com:6379/0"
+   redisUri: "redis://:${HOOKSHOT_REDIS_PASSWORD}@external-redis-or-valkey.example.com:6379/0"
  
  logging:
    level: info
  
  
  [20 lines unchanged)]
  
  
  
  widgets:
    publicUrl: https://hookshot.ess.localhost/widgetapi/v1/static



@@ StatefulSet/ess-ci/release-name-hookshot - spec.template.spec.initContainers.render-config.env.HOOKSHOT_REDIS_PASSWORD.value @@
- {{ readfile "/secrets/release-name-redis-credentials/password" | urlencode }}
+ {{ readfile "/secrets/release-name-redis-valkey-credentials/password" | urlencode }}

@@ StatefulSet/ess-ci/release-name-hookshot - spec.template.spec.initContainers.render-config.volumeMounts @@
- - name: secret-b01d9752db53
-   mountPath: /secrets/release-name-redis-credentials
-   readOnly: true
+   - name: secret-65ff74679bb0
+     mountPath: /secrets/release-name-redis-valkey-credentials
+     readOnly: true

@@ StatefulSet/ess-ci/release-name-hookshot - spec.template.spec.containers.hookshot.volumeMounts @@
- - name: secret-b01d9752db53
-   mountPath: /secrets/release-name-redis-credentials
-   readOnly: true
+   - name: secret-65ff74679bb0
+     mountPath: /secrets/release-name-redis-valkey-credentials
+     readOnly: true

@@ StatefulSet/ess-ci/release-name-hookshot - spec.template.spec.volumes @@
- - name: secret-b01d9752db53
-   secret:
-     secretName: release-name-redis-credentials
+   - name: secret-65ff74679bb0
+     secret:
+       secretName: release-name-redis-valkey-credentials

hookshot-secrets-in-helm-values.yaml
@@ ConfigMap/ess-ci/release-name-hookshot - data.config-override.yaml @@
  bridge:
    domain: "ess.localhost"
    port: 9993
    bindAddress: "::"
  
  passFile: /secrets/release-name-hookshot/RSA_PASSKEY
  
  cache:
-   redisUri: "redis://:${HOOKSHOT_REDIS_PASSWORD}@external-redis.example.com:6379/0"
+   redisUri: "redis://:${HOOKSHOT_REDIS_PASSWORD}@external-redis-or-valkey.example.com:6379/0"
  
  logging:
    level: info
  
  
  [20 lines unchanged)]
  
  
  
  widgets:
    publicUrl: https://hookshot.ess.localhost/widgetapi/v1/static



@@ Secret/ess-ci/release-name-hookshot-pre - data.REDIS_PASSWORD @@
- dGVzdC1yZWRpcy1wYXNzd29yZA==
+ dGVzdC1yZWRpcy12YWxrZXktcGFzc3dvcmQ=



@@ Secret/ess-ci/release-name-hookshot - data.REDIS_PASSWORD @@
- dGVzdC1yZWRpcy1wYXNzd29yZA==
+ dGVzdC1yZWRpcy12YWxrZXktcGFzc3dvcmQ=

matrix-rtc-secrets-externally-values.yaml
@@ ConfigMap/ess-ci/release-name-matrix-rtc-sfu - data.config-overrides.yaml @@
  port: 7880
  
  prometheus:
    port: 6789
  
  [17 lines unchanged)]
  
  
  key_file: /conf/keys.yaml
  
  redis:
-   address: external-redis.example.com:6379
+   address: external-redis-or-valkey.example.com:6379
    password: ${SFU_REDIS_PASSWORD}
  
  room:
    auto_create: false
  
  [two lines unchanged)]
  
    api_key: CHANGEME-oolahd9xooshohSh5IeQu1natheur1oo
  
    urls:
    - http://release-name-matrix-rtc-authorisation-service.ess-ci.svc.cluster.local.:8080/sfu_webhook



@@ Deployment/ess-ci/release-name-matrix-rtc-sfu - spec.template.spec.initContainers.render-config-keys-yaml.env.SFU_REDIS_PASSWORD.value @@
- {{ readfile "/secrets/release-name-redis-credentials/password" | quote }}
+ {{ readfile "/secrets/release-name-redis-valkey-credentials/password" | quote }}

@@ Deployment/ess-ci/release-name-matrix-rtc-sfu - spec.template.spec.initContainers.render-config-keys-yaml.volumeMounts @@
- - name: secret-b01d9752db53
-   mountPath: /secrets/release-name-redis-credentials
-   readOnly: true
+   - name: secret-65ff74679bb0
+     mountPath: /secrets/release-name-redis-valkey-credentials
+     readOnly: true

@@ Deployment/ess-ci/release-name-matrix-rtc-sfu - spec.template.spec.initContainers.render-config-sfu.env.SFU_REDIS_PASSWORD.value @@
- {{ readfile "/secrets/release-name-redis-credentials/password" | quote }}
+ {{ readfile "/secrets/release-name-redis-valkey-credentials/password" | quote }}

@@ Deployment/ess-ci/release-name-matrix-rtc-sfu - spec.template.spec.initContainers.render-config-sfu.volumeMounts @@
- - name: secret-b01d9752db53
-   mountPath: /secrets/release-name-redis-credentials
-   readOnly: true
+   - name: secret-65ff74679bb0
+     mountPath: /secrets/release-name-redis-valkey-credentials
+     readOnly: true

@@ Deployment/ess-ci/release-name-matrix-rtc-sfu - spec.template.spec.containers.sfu.volumeMounts @@
- - name: secret-b01d9752db53
-   mountPath: /secrets/release-name-redis-credentials
-   readOnly: true
+   - name: secret-65ff74679bb0
+     mountPath: /secrets/release-name-redis-valkey-credentials
+     readOnly: true

@@ Deployment/ess-ci/release-name-matrix-rtc-sfu - spec.template.spec.volumes @@
- - name: secret-b01d9752db53
-   secret:
-     secretName: release-name-redis-credentials
+   - name: secret-65ff74679bb0
+     secret:
+       secretName: release-name-redis-valkey-credentials

matrix-rtc-secrets-in-helm-values.yaml
@@ ConfigMap/ess-ci/release-name-matrix-rtc-sfu - data.config-overrides.yaml @@
  port: 7880
  
  prometheus:
    port: 6789
  
  [17 lines unchanged)]
  
  
  key_file: /conf/keys.yaml
  
  redis:
-   address: external-redis.example.com:6379
+   address: external-redis-or-valkey.example.com:6379
    password: ${SFU_REDIS_PASSWORD}
  
  room:
    auto_create: false
  
  [two lines unchanged)]
  
    api_key: CHANGEME-oolahd9xooshohSh5IeQu1natheur1oo
  
    urls:
    - http://release-name-matrix-rtc-authorisation-service.ess-ci.svc.cluster.local.:8080/sfu_webhook



@@ Secret/ess-ci/release-name-matrix-rtc-sfu - data.REDIS_PASSWORD @@
- dGVzdC1yZWRpcy1wYXNzd29yZA==
+ dGVzdC1yZWRpcy12YWxrZXktcGFzc3dvcmQ=

synapse-hookshot-secrets-externally-values.yaml
@@ ConfigMap/ess-ci/release-name-hookshot - data.config-override.yaml @@
  bridge:
    domain: "ess.localhost"
    url: "http://release-name-synapse.ess-ci.svc.cluster.local.:8008"
    port: 9993
  
  [one line unchanged)]
  
  
  passFile: /secrets/release-name-hookshot-external-passkey/passfile
  
  cache:
-   redisUri: "redis://:${HOOKSHOT_REDIS_PASSWORD}@external-redis.example.com:6379/0"
+   redisUri: "redis://:${HOOKSHOT_REDIS_PASSWORD}@external-redis-or-valkey.example.com:6379/0"
  
  logging:
    level: info
  
  
  [20 lines unchanged)]
  
  
  
  widgets:
    publicUrl: https://hookshot.ess.localhost/widgetapi/v1/static



@@ StatefulSet/ess-ci/release-name-hookshot - spec.template.spec.initContainers.render-config.env.HOOKSHOT_REDIS_PASSWORD.value @@
- {{ readfile "/secrets/release-name-redis-credentials/password" | urlencode }}
+ {{ readfile "/secrets/release-name-redis-valkey-credentials/password" | urlencode }}

@@ StatefulSet/ess-ci/release-name-hookshot - spec.template.spec.initContainers.render-config.volumeMounts @@
- - name: secret-b01d9752db53
-   mountPath: /secrets/release-name-redis-credentials
-   readOnly: true
+   - name: secret-65ff74679bb0
+     mountPath: /secrets/release-name-redis-valkey-credentials
+     readOnly: true

@@ StatefulSet/ess-ci/release-name-hookshot - spec.template.spec.containers.hookshot.volumeMounts @@
- - name: secret-b01d9752db53
-   mountPath: /secrets/release-name-redis-credentials
-   readOnly: true
+   - name: secret-65ff74679bb0
+     mountPath: /secrets/release-name-redis-valkey-credentials
+     readOnly: true

@@ StatefulSet/ess-ci/release-name-hookshot - spec.template.spec.volumes @@
- - name: secret-b01d9752db53
-   secret:
-     secretName: release-name-redis-credentials
+   - name: secret-65ff74679bb0
+     secret:
+       secretName: release-name-redis-valkey-credentials

synapse-hookshot-secrets-in-helm-values.yaml
@@ ConfigMap/ess-ci/release-name-hookshot - data.config-override.yaml @@
  bridge:
    domain: "ess.localhost"
    url: "http://release-name-synapse.ess-ci.svc.cluster.local.:8008"
    port: 9993
  
  [one line unchanged)]
  
  
  passFile: /secrets/release-name-hookshot/RSA_PASSKEY
  
  cache:
-   redisUri: "redis://:${HOOKSHOT_REDIS_PASSWORD}@external-redis.example.com:6379/0"
+   redisUri: "redis://:${HOOKSHOT_REDIS_PASSWORD}@external-redis-or-valkey.example.com:6379/0"
  
  logging:
    level: info
  
  
  [20 lines unchanged)]
  
  
  
  widgets:
    publicUrl: https://hookshot.ess.localhost/widgetapi/v1/static



@@ Secret/ess-ci/release-name-hookshot-pre - data.REDIS_PASSWORD @@
- dGVzdC1yZWRpcy1wYXNzd29yZA==
+ dGVzdC1yZWRpcy12YWxrZXktcGFzc3dvcmQ=



@@ Secret/ess-ci/release-name-hookshot - data.REDIS_PASSWORD @@
- dGVzdC1yZWRpcy1wYXNzd29yZA==
+ dGVzdC1yZWRpcy12YWxrZXktcGFzc3dvcmQ=

synapse-redis-secrets-externally-values.yaml
@@ ConfigMap/ess-ci/release-name-synapse-hook - data.04-homeserver-overrides.yaml @@
  public_baseurl: https://synapse.ess.localhost/
  server_name: ess.localhost
  signing_key_path: /secrets/release-name-generated/SYNAPSE_SIGNING_KEY
  enable_metrics: true
  
  [55 lines unchanged)]
  
      port: 9093
  
  redis:
    enabled: true
-   host: "external-redis.example.com"
+   host: "external-redis-or-valkey.example.com"
    port: 6379
    password: ${SYNAPSE_REDIS_PASSWORD}
  
  stream_writers:
    events:
    - release-name-synapse-event-persist-0



@@ ConfigMap/ess-ci/release-name-synapse - data.04-homeserver-overrides.yaml @@
  public_baseurl: https://synapse.ess.localhost/
  server_name: ess.localhost
  signing_key_path: /secrets/release-name-generated/SYNAPSE_SIGNING_KEY
  enable_metrics: true
  
  [55 lines unchanged)]
  
      port: 9093
  
  redis:
    enabled: true
-   host: "external-redis.example.com"
+   host: "external-redis-or-valkey.example.com"
    port: 6379
    password: ${SYNAPSE_REDIS_PASSWORD}
  
  stream_writers:
    events:
    - release-name-synapse-event-persist-0



@@ Job/ess-ci/release-name-synapse-check-config - spec.template.spec.initContainers.render-config.env.SYNAPSE_REDIS_PASSWORD.value @@
- {{ readfile "/secrets/release-name-redis-credentials/password" | quote }}
+ {{ readfile "/secrets/release-name-redis-valkey-credentials/password" | quote }}

@@ Job/ess-ci/release-name-synapse-check-config - spec.template.spec.initContainers.render-config.volumeMounts @@
- - name: secret-b01d9752db53
-   mountPath: /secrets/release-name-redis-credentials
-   readOnly: true
+   - name: secret-65ff74679bb0
+     mountPath: /secrets/release-name-redis-valkey-credentials
+     readOnly: true

@@ Job/ess-ci/release-name-synapse-check-config - spec.template.spec.containers.synapse.volumeMounts @@
- - name: secret-b01d9752db53
-   mountPath: /secrets/release-name-redis-credentials
-   readOnly: true
+   - name: secret-65ff74679bb0
+     mountPath: /secrets/release-name-redis-valkey-credentials
+     readOnly: true

@@ Job/ess-ci/release-name-synapse-check-config - spec.template.spec.volumes @@
- - name: secret-b01d9752db53
-   secret:
-     secretName: release-name-redis-credentials
+   - name: secret-65ff74679bb0
+     secret:
+       secretName: release-name-redis-valkey-credentials



@@ StatefulSet/ess-ci/release-name-synapse-appservice - spec.template.spec.initContainers.render-config.env.SYNAPSE_REDIS_PASSWORD.value @@
- {{ readfile "/secrets/release-name-redis-credentials/password" | quote }}
+ {{ readfile "/secrets/release-name-redis-valkey-credentials/password" | quote }}

@@ StatefulSet/ess-ci/release-name-synapse-appservice - spec.template.spec.initContainers.render-config.volumeMounts @@
- - name: secret-b01d9752db53
-   mountPath: /secrets/release-name-redis-credentials
-   readOnly: true
+   - name: secret-65ff74679bb0
+     mountPath: /secrets/release-name-redis-valkey-credentials
+     readOnly: true

@@ StatefulSet/ess-ci/release-name-synapse-appservice - spec.template.spec.containers.synapse.volumeMounts @@
- - name: secret-b01d9752db53
-   mountPath: /secrets/release-name-redis-credentials
-   readOnly: true
+   - name: secret-65ff74679bb0
+     mountPath: /secrets/release-name-redis-valkey-credentials
+     readOnly: true

@@ StatefulSet/ess-ci/release-name-synapse-appservice - spec.template.spec.volumes @@
- - name: secret-b01d9752db53
-   secret:
-     secretName: release-name-redis-credentials
+   - name: secret-65ff74679bb0
+     secret:
+       secretName: release-name-redis-valkey-credentials



@@ StatefulSet/ess-ci/release-name-synapse-client-reader - spec.template.spec.initContainers.render-config.env.SYNAPSE_REDIS_PASSWORD.value @@
- {{ readfile "/secrets/release-name-redis-credentials/password" | quote }}
+ {{ readfile "/secrets/release-name-redis-valkey-credentials/password" | quote }}

@@ StatefulSet/ess-ci/release-name-synapse-client-reader - spec.template.spec.initContainers.render-config.volumeMounts @@
- - name: secret-b01d9752db53
-   mountPath: /secrets/release-name-redis-credentials
-   readOnly: true
+   - name: secret-65ff74679bb0
+     mountPath: /secrets/release-name-redis-valkey-credentials
+     readOnly: true

@@ StatefulSet/ess-ci/release-name-synapse-client-reader - spec.template.spec.containers.synapse.volumeMounts @@
- - name: secret-b01d9752db53
-   mountPath: /secrets/release-name-redis-credentials
-   readOnly: true
+   - name: secret-65ff74679bb0
+     mountPath: /secrets/release-name-redis-valkey-credentials
+     readOnly: true

@@ StatefulSet/ess-ci/release-name-synapse-client-reader - spec.template.spec.volumes @@
- - name: secret-b01d9752db53
-   secret:
-     secretName: release-name-redis-credentials
+   - name: secret-65ff74679bb0
+     secret:
+       secretName: release-name-redis-valkey-credentials



@@ StatefulSet/ess-ci/release-name-synapse-event-persist - spec.template.spec.initContainers.render-config.env.SYNAPSE_REDIS_PASSWORD.value @@
- {{ readfile "/secrets/release-name-redis-credentials/password" | quote }}
+ {{ readfile "/secrets/release-name-redis-valkey-credentials/password" | quote }}

@@ StatefulSet/ess-ci/release-name-synapse-event-persist - spec.template.spec.initContainers.render-config.volumeMounts @@
- - name: secret-b01d9752db53
-   mountPath: /secrets/release-name-redis-credentials
-   readOnly: true
+   - name: secret-65ff74679bb0
+     mountPath: /secrets/release-name-redis-valkey-credentials
+     readOnly: true

@@ StatefulSet/ess-ci/release-name-synapse-event-persist - spec.template.spec.containers.synapse.volumeMounts @@
- - name: secret-b01d9752db53
-   mountPath: /secrets/release-name-redis-credentials
-   readOnly: true
+   - name: secret-65ff74679bb0
+     mountPath: /secrets/release-name-redis-valkey-credentials
+     readOnly: true

@@ StatefulSet/ess-ci/release-name-synapse-event-persist - spec.template.spec.volumes @@
- - name: secret-b01d9752db53
-   secret:
-     secretName: release-name-redis-credentials
+   - name: secret-65ff74679bb0
+     secret:
+       secretName: release-name-redis-valkey-credentials



@@ StatefulSet/ess-ci/release-name-synapse-fed-reader - spec.template.spec.initContainers.render-config.env.SYNAPSE_REDIS_PASSWORD.value @@
- {{ readfile "/secrets/release-name-redis-credentials/password" | quote }}
+ {{ readfile "/secrets/release-name-redis-valkey-credentials/password" | quote }}

@@ StatefulSet/ess-ci/release-name-synapse-fed-reader - spec.template.spec.initContainers.render-config.volumeMounts @@
- - name: secret-b01d9752db53
-   mountPath: /secrets/release-name-redis-credentials
-   readOnly: true
+   - name: secret-65ff74679bb0
+     mountPath: /secrets/release-name-redis-valkey-credentials
+     readOnly: true

@@ StatefulSet/ess-ci/release-name-synapse-fed-reader - spec.template.spec.containers.synapse.volumeMounts @@
- - name: secret-b01d9752db53
-   mountPath: /secrets/release-name-redis-credentials
-   readOnly: true
+   - name: secret-65ff74679bb0
+     mountPath: /secrets/release-name-redis-valkey-credentials
+     readOnly: true

@@ StatefulSet/ess-ci/release-name-synapse-fed-reader - spec.template.spec.volumes @@
- - name: secret-b01d9752db53
-   secret:
-     secretName: release-name-redis-credentials
+   - name: secret-65ff74679bb0
+     secret:
+       secretName: release-name-redis-valkey-credentials



@@ StatefulSet/ess-ci/release-name-synapse-main - spec.template.spec.initContainers.render-config.env.SYNAPSE_REDIS_PASSWORD.value @@
- {{ readfile "/secrets/release-name-redis-credentials/password" | quote }}
+ {{ readfile "/secrets/release-name-redis-valkey-credentials/password" | quote }}

@@ StatefulSet/ess-ci/release-name-synapse-main - spec.template.spec.initContainers.render-config.volumeMounts @@
- - name: secret-b01d9752db53
-   mountPath: /secrets/release-name-redis-credentials
-   readOnly: true
+   - name: secret-65ff74679bb0
+     mountPath: /secrets/release-name-redis-valkey-credentials
+     readOnly: true

@@ StatefulSet/ess-ci/release-name-synapse-main - spec.template.spec.containers.synapse.volumeMounts @@
- - name: secret-b01d9752db53
-   mountPath: /secrets/release-name-redis-credentials
-   readOnly: true
+   - name: secret-65ff74679bb0
+     mountPath: /secrets/release-name-redis-valkey-credentials
+     readOnly: true

@@ StatefulSet/ess-ci/release-name-synapse-main - spec.template.spec.volumes @@
- - name: secret-b01d9752db53
-   secret:
-     secretName: release-name-redis-credentials
+   - name: secret-65ff74679bb0
+     secret:
+       secretName: release-name-redis-valkey-credentials

synapse-redis-secrets-in-helm-values.yaml
@@ ConfigMap/ess-ci/release-name-synapse-hook - data.04-homeserver-overrides.yaml @@
  public_baseurl: https://synapse.ess.localhost/
  server_name: ess.localhost
  signing_key_path: /secrets/release-name-generated/SYNAPSE_SIGNING_KEY
  enable_metrics: true
  
  [55 lines unchanged)]
  
      port: 9093
  
  redis:
    enabled: true
-   host: "external-redis.example.com"
+   host: "external-redis-or-valkey.example.com"
    port: 6379
    password: ${SYNAPSE_REDIS_PASSWORD}
  
  stream_writers:
    events:
    - release-name-synapse-event-persist-0



@@ ConfigMap/ess-ci/release-name-synapse - data.04-homeserver-overrides.yaml @@
  public_baseurl: https://synapse.ess.localhost/
  server_name: ess.localhost
  signing_key_path: /secrets/release-name-generated/SYNAPSE_SIGNING_KEY
  enable_metrics: true
  
  [55 lines unchanged)]
  
      port: 9093
  
  redis:
    enabled: true
-   host: "external-redis.example.com"
+   host: "external-redis-or-valkey.example.com"
    port: 6379
    password: ${SYNAPSE_REDIS_PASSWORD}
  
  stream_writers:
    events:
    - release-name-synapse-event-persist-0



@@ Secret/ess-ci/release-name-synapse-hook - data.REDIS_PASSWORD @@
- dGVzdC1yZWRpcy1wYXNzd29yZA==
+ dGVzdC1yZWRpcy12YWxrZXktcGFzc3dvcmQ=



@@ Secret/ess-ci/release-name-synapse - data.REDIS_PASSWORD @@
- dGVzdC1yZWRpcy1wYXNzd29yZA==
+ dGVzdC1yZWRpcy12YWxrZXktcGFzc3dvcmQ=

@benbz
benbz force-pushed the bbz/rename-external-redis-properties-in-values-files branch from ac76923 to 8095b16 Compare September 2, 2026 13:30
@benbz
benbz force-pushed the bbz/rename-external-redis-properties-in-values-files branch 2 times, most recently from 1111c2b to f7e8948 Compare September 2, 2026 13:35
@benbz
benbz force-pushed the bbz/rename-external-redis-properties-in-values-files branch from f7e8948 to b03333d Compare September 2, 2026 13:43
@benbz
benbz merged commit b6a4ca4 into main Sep 2, 2026
195 of 196 checks passed
@benbz
benbz deleted the bbz/rename-external-redis-properties-in-values-files branch September 2, 2026 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants