Revert valkey changes so they can be made in a separate PR

bitnami · Feb 20, 2025 · d3dd475 · d3dd475
1 parent 2f713f2
commit d3dd475
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 21 deletions.
diff --git a/bitnami/valkey/Chart.yaml b/bitnami/valkey/Chart.yaml
@@ -36,4 +36,4 @@ maintainers:
 name: valkey
 sources:
   - https://github.com/bitnami/charts/tree/main/bitnami/valkey
-version: 2.3.1
+version: 2.3.0
diff --git a/bitnami/valkey/templates/scripts-configmap.yaml b/bitnami/valkey/templates/scripts-configmap.yaml
@@ -779,22 +779,14 @@ data:
   update-primary-label.sh: |
     #!/bin/bash
     while true; do
-        while [ ! -f "/etc/shared/current" ] && [ ! -f "/etc/shared/terminate" ]; do
+        while [ ! -f "/etc/shared/current" ]; do
             sleep 1
         done
-
-        if [ -f "/etc/shared/current" ]; then
-            echo "new primary elected, updating label(s)..."
-            kubectl label pod --field-selector metadata.name="$(< "/etc/shared/current")" isPrimary="true" --overwrite
-            if [ -f /etc/shared/previous ]; then
-                kubectl label pod --field-selector metadata.name="$(< "/etc/shared/previous")" isPrimary="false" --overwrite
-            fi
-            rm "/etc/shared/current" "/etc/shared/previous"
-        fi
-
-        if [ -f "/etc/shared/terminate" ]; then
-            echo "received signal to terminate"
-            exit
+        echo "new primary elected, updating label(s)..."
+        kubectl label pod --field-selector metadata.name="$(< "/etc/shared/current")" isPrimary="true" --overwrite
+        if [ -f /etc/shared/previous ]; then
+            kubectl label pod --field-selector metadata.name="$(< "/etc/shared/previous")" isPrimary="false" --overwrite
         fi
+        rm "/etc/shared/current" "/etc/shared/previous"
     done
 {{- end }}
diff --git a/bitnami/valkey/templates/sentinel/statefulset.yaml b/bitnami/valkey/templates/sentinel/statefulset.yaml
@@ -639,12 +639,6 @@ spec:
           image: {{ template "valkey.kubectl.image" . }}
           imagePullPolicy: {{ .Values.kubectl.image.pullPolicy | quote }}
           command: {{- toYaml .Values.kubectl.command | nindent 12 }}
-          lifecycle:
-            preStop:
-              exec:
-                command:
-                  - touch
-                  - /etc/shared/terminate
           {{- if .Values.kubectl.containerSecurityContext.enabled }}
           securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.kubectl.containerSecurityContext "context" $) | nindent 12 }}
           {{- end }}