diff --git a/.vib/redis/vib-publish.json b/.vib/redis/vib-publish.json index f0e53ed5d9..27fe6ffb14 100644 --- a/.vib/redis/vib-publish.json +++ b/.vib/redis/vib-publish.json @@ -38,16 +38,6 @@ "endpoint": "lb-redis-master-tcp-redis" } }, - { - "action_id": "resilience-tests", - "params": { - "test_cases": [ - "testKubernetesPodDelete", - "testPodScaleUp", - "testPodScaleDown" - ] - } - }, { "action_id": "goss", "params": { diff --git a/.vib/redis/vib-verify.json b/.vib/redis/vib-verify.json index 5fb18e266d..cfe43cfb60 100644 --- a/.vib/redis/vib-verify.json +++ b/.vib/redis/vib-verify.json @@ -38,16 +38,6 @@ "endpoint": "lb-redis-master-tcp-redis" } }, - { - "action_id": "resilience-tests", - "params": { - "test_cases": [ - "testKubernetesPodDelete", - "testPodScaleUp", - "testPodScaleDown" - ] - } - }, { "action_id": "goss", "params": { diff --git a/bitnami/redis/Chart.yaml b/bitnami/redis/Chart.yaml index 674b459c39..8da97b53a3 100644 --- a/bitnami/redis/Chart.yaml +++ b/bitnami/redis/Chart.yaml @@ -22,4 +22,4 @@ maintainers: name: redis sources: - https://github.com/bitnami/containers/tree/main/bitnami/redis -version: 17.7.0 +version: 17.7.1 diff --git a/bitnami/redis/templates/tls-secret.yaml b/bitnami/redis/templates/tls-secret.yaml index 4f9c39b85d..3479370a48 100644 --- a/bitnami/redis/templates/tls-secret.yaml +++ b/bitnami/redis/templates/tls-secret.yaml @@ -1,6 +1,5 @@ {{- if (include "redis.createTlsSecret" .) }} {{- $secretName := printf "%s-crt" (include "common.names.fullname" .) }} -{{- $existingCerts := (lookup "v1" "Secret" .Release.Namespace $secretName).data | default dict }} {{- $ca := genCA "redis-ca" 365 }} {{- $releaseNamespace := .Release.Namespace }} {{- $clusterDomain := .Values.clusterDomain }} @@ -9,7 +8,7 @@ {{- $headlessServiceName := printf "%s-headless" (include "common.names.fullname" .) }} {{- $masterServiceName := printf "%s-master" (include "common.names.fullname" .) }} {{- $altNames := list (printf "*.%s.%s.svc.%s" $serviceName $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $masterServiceName $releaseNamespace $clusterDomain) (printf "*.%s.%s.svc.%s" $masterServiceName $releaseNamespace $clusterDomain) (printf "*.%s.%s.svc.%s" $headlessServiceName $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $headlessServiceName $releaseNamespace $clusterDomain) "127.0.0.1" "localhost" $fullname }} -{{- $crt := genSignedCert $fullname nil $altNames 365 $ca }} +{{- $cert := genSignedCert $fullname nil $altNames 365 $ca }} apiVersion: v1 kind: Secret metadata: @@ -24,7 +23,7 @@ metadata: {{- end }} type: kubernetes.io/tls data: - ca.crt: {{ (get $existingCerts "ca.crt") | default ($ca.Cert | b64enc | quote ) }} - tls.crt: {{ (get $existingCerts "tls.crt") | default ($crt.Cert | b64enc | quote) }} - tls.key: {{ (get $existingCerts "tls.key") | default ($crt.Key | b64enc | quote) }} + tls.crt: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "tls.crt" "defaultValue" $cert.Cert "context" $) }} + tls.key: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "tls.key" "defaultValue" $cert.Key "context" $) }} + ca.crt: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "ca.crt" "defaultValue" $ca.Cert "context" $) }} {{- end }}