chore(charts): use condition

Author: duanhongyi

charts/valkey/templates/valkey-secret-creds.yaml

@@ -1,4 +1,3 @@
-{{- if eq .Values.global.valkeyLocation "on-cluster" }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -8,4 +7,3 @@ metadata:
     heritage: drycc
 data:
   password: {{ include "common.secrets.lookup" (dict "secret" "valkey-creds" "key" "password" "defaultValue" (randAlphaNum 32) "context" $) }}
-{{- end }}

charts/valkey/templates/valkey-statefulset.yaml

@@ -1,4 +1,3 @@
-{{- if eq .Values.global.valkeyLocation "on-cluster" }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -251,4 +250,3 @@ spec:
         requests:
           storage: {{ .Values.persistence.size | quote }}
   {{- end }}
-{{- end }}

charts/valkey/templates/valkey-svc.yaml

@@ -1,4 +1,3 @@
-{{- if eq .Values.global.valkeyLocation "on-cluster" }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -27,4 +26,3 @@ spec:
     protocol: TCP
   selector:
     app: drycc-valkey
-{{- end }}

charts/valkey/values.yaml

@@ -39,10 +39,6 @@ podAntiAffinityPreset:
 # The following parameters are configured only when using an on-cluster Valkey instance
 replicas: 3
 
-# The following parameters are configured only when using an off-cluster Valkey instance
-addrs: "" # A list of clusters: "127.0.0.1:7001/1,127.0.0.2:7002/1"
-password: "valkey password" # "" == no password
-
 # Service
 service:
   # Provide any additional service annotations
@@ -60,10 +56,3 @@ global:
   # Each part must be 1 to 63 characters in length and can contain lowercase letters, digits, and hyphens (-).
   # It must start and end with a lowercase letter or digit.
   clusterDomain: "cluster.local"
-  # Set the location of Workflow's valkey instance
-  #
-  # Valid values are:
-  # - on-cluster: Run Valkey within the Kubernetes cluster
-  # - off-cluster: Run Valkey outside the Kubernetes cluster (configure in valkey section)
-  valkeyLocation: "on-cluster"
-  

rootfs/Dockerfile

@@ -4,7 +4,7 @@ FROM registry.drycc.cc/drycc/base:${CODENAME}
 ENV DRYCC_UID=1001 \
   DRYCC_GID=1001 \
   DRYCC_HOME_DIR=/data \
-  VALKEY_VERSION="8.1.0" \
+  VALKEY_VERSION="8.1.1" \
   VALKEY_SENTINEL_PROXY_VERSION="1.0.2"
 
 RUN groupadd drycc --gid ${DRYCC_GID} \

rootfs/bin/valkey-start

@@ -98,7 +98,7 @@ start_valkey_sentinel() {
     else
         printf "\nsentinel monitor drycc %s %s 2" "${announce_ip}" "${SERVER_PORT}" >> ${VALKEY_SENTINEL_CONFIG_FILE}
     fi
-    exec valkey-sentinel $VALKEY_SENTINEL_CONFIG_FILE
+    exec valkey-server $VALKEY_SENTINEL_CONFIG_FILE --sentinel
 }
 
 command="$1"