Fix minor cluster issues

Author: qjsoq

README.md

@@ -31,7 +31,7 @@ To deploy the cluster mode using the local chart files:
 
 ```bash
 # Navigate to the directory containing the chart
-cd fork_valkey_helm/valkey-helm
+cd ./valkey-helm
 
 # Install the chart from local files
 helm install valkey-cluster ./valkey-cluster
@@ -41,7 +41,7 @@ helm install valkey-cluster ./valkey-cluster
 You can customize the installation by providing values:
 
 ```bash
-helm install valkey-cluster ./valkey-cluster --values my-values.yaml
+helm install valkey-cluster ./valkey-cluster -f my-values.yaml
 ```
 
 Cluster mode features:

valkey-cluster/README.md

@@ -34,6 +34,7 @@ This minimum of 6 nodes typically represents:
 | dataStorage.persistentVolumeClaimName | string | `nil` |  |
 | dataStorage.requestedSize | string | `nil` |  |
 | dataStorage.volumeName | string | `"valkey-data"` |  |
+| extraInitContainers | list | `[]` |  |
 | env | object | `{}` |  |
 | existingSecret | string | `""` |  |
 | existingSecretPasswordKey | string | `""` |  |

valkey-cluster/templates/cluster_config.yaml

@@ -120,6 +120,7 @@ data:
         done
         NODES="${NODES} ${NODE_HOST}:6379"
       done
+      sleep 6
 
       echo "Creating cluster with nodes: ${NODES}"
       echo "yes" | valkey-cli ${AUTH_OPTION} --cluster create ${NODES} --cluster-replicas "${REPLICA_COUNT}"

valkey-cluster/templates/deploy_valkey.yaml

@@ -1,7 +1,7 @@
 {{- $fullname := include "valkey-cluster.fullname" . }}
 {{- $storage := .Values.dataStorage }}
 {{- $useExistingPVC := and $storage.enabled (not (empty $storage.persistentVolumeClaimName)) }}
-{{- $createPVC := and $storage.enabled (not (empty $storage.requestedSize)) (empty $storage.persistentVolumeClaimName) }}{{- $useConfigMap := or (not (empty .Values.valkeyConfig)) (gt (int .Values.replicaCount) 1) -}}
+{{- $createPVC := and $storage.enabled (not (empty $storage.requestedSize)) (empty $storage.persistentVolumeClaimName) }}{{- $useConfigMap := or (not (empty .Values.valkeyConfig | default "")) (gt (int .Values.replicaCount) 1) -}}
 {{- $configFile := "/data/conf/valkey.conf" -}}
 
 apiVersion: apps/v1
@@ -195,7 +195,7 @@ spec:
             - name: http-metrics
               containerPort: {{ .Values.metrics.containerPorts.http }}
           {{- if .Values.metrics.resources }}
-          resources: {{- toYaml .Values.metrics.resources | nindent 12 }}}
+          resources: {{- toYaml .Values.metrics.resources | nindent 12 }}
           {{- end }}
         {{- end }}
 

valkey-cluster/values.yaml

@@ -17,7 +17,7 @@ containerPorts:
 
 podDisruptionBudget: {}
 
-podLabels: {}
+valkeyAnnotations: {}
 
 commonLabels: {}
 
@@ -235,6 +235,8 @@ lifecycleHooks:
 # Mount additional configMaps into the Valkey container
 extraValkeyConfigs: []
 
+extraInitContainers: []
+
 # Mount extra secrets as volume to init container (deprecated, use extraValkeySecrets)
 extraSecretValkeyConfigs: false
 
@@ -291,6 +293,7 @@ metrics:
   service:
     type: ClusterIP
     clusterIP: ""
+    labels: {}
 
 
   containerPorts: