✏️ Remove pvc for sentinel

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
ParminCloud · Jan 25, 2025 · 2f83cdf · 2f83cdf
1 parent 8f45a2d
commit 2f83cdf
Show file tree

Hide file tree

Showing 41 changed files with 6 additions and 39 deletions.
diff --git a/.github/workflows/release-charts.yaml b/.github/workflows/release-charts.yaml
@@ -30,6 +30,5 @@ jobs:
         uses: helm/chart-releaser-action@v1.6.0
         with:
           mark_as_latest: true
-          charts_dir: ${{ github.workspace }}
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/redis-ha/.helmignore → charts/redis-ha/.helmignore b/redis-ha/.helmignore → charts/redis-ha/.helmignore
diff --git a/redis-ha/Chart.yaml → charts/redis-ha/Chart.yaml b/redis-ha/Chart.yaml → charts/redis-ha/Chart.yaml
@@ -5,7 +5,7 @@ keywords:
 - redis
 - keyvalue
 - database
-version: 4.33.1
+version: 4.33.2
 appVersion: 7.2.4
 description: This Helm chart provides a highly available Redis implementation with a master/slave configuration and uses Sentinel sidecars for failover management
 icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png

diff --git a/redis-ha/README.md → charts/redis-ha/README.md b/redis-ha/README.md → charts/redis-ha/README.md
diff --git a/redis-ha/README.md.gotmpl → charts/redis-ha/README.md.gotmpl b/redis-ha/README.md.gotmpl → charts/redis-ha/README.md.gotmpl
@@ -14,10 +14,11 @@ helm repo add parmincloud https://parmincloud.github.io/charts
 helm install parmincloud/redis-ha
 ```
 
-By default this chart install 3 pods total:
+By default this chart install 6 pods total:
 
-* one pod containing a redis master and sentinel container (optional prometheus metrics exporter sidecar available)
-* two pods each containing a redis slave and sentinel containers (optional prometheus metrics exporter sidecars available)
+* one pod containing a redis master container (optional prometheus metrics exporter sidecar available)
+* two pods each containing a redis slave container (optional prometheus metrics exporter sidecars available)
+* three pods containing a redis sentinel connected to their corresponding redis server
 
 ## Introduction
 

diff --git a/redis-ha/ci/haproxy-enabled-values.yaml → ...s/redis-ha/ci/haproxy-enabled-values.yaml b/redis-ha/ci/haproxy-enabled-values.yaml → ...s/redis-ha/ci/haproxy-enabled-values.yaml
diff --git a/redis-ha/ci/multi-value-configs-values.yaml → ...dis-ha/ci/multi-value-configs-values.yaml b/redis-ha/ci/multi-value-configs-values.yaml → ...dis-ha/ci/multi-value-configs-values.yaml
diff --git a/redis-ha/templates/NOTES.txt → charts/redis-ha/templates/NOTES.txt b/redis-ha/templates/NOTES.txt → charts/redis-ha/templates/NOTES.txt
diff --git a/redis-ha/templates/_configs.tpl → charts/redis-ha/templates/_configs.tpl b/redis-ha/templates/_configs.tpl → charts/redis-ha/templates/_configs.tpl
diff --git a/redis-ha/templates/_helpers.tpl → charts/redis-ha/templates/_helpers.tpl b/redis-ha/templates/_helpers.tpl → charts/redis-ha/templates/_helpers.tpl
diff --git a/redis-ha/templates/redis-auth-secret.yaml → ...redis-ha/templates/redis-auth-secret.yaml b/redis-ha/templates/redis-auth-secret.yaml → ...redis-ha/templates/redis-auth-secret.yaml
diff --git a/.../templates/redis-ha-announce-service.yaml → .../templates/redis-ha-announce-service.yaml b/.../templates/redis-ha-announce-service.yaml → .../templates/redis-ha-announce-service.yaml
diff --git a/redis-ha/templates/redis-ha-configmap.yaml → ...edis-ha/templates/redis-ha-configmap.yaml b/redis-ha/templates/redis-ha-configmap.yaml → ...edis-ha/templates/redis-ha-configmap.yaml
diff --git a/...s/redis-ha-exporter-script-configmap.yaml → ...s/redis-ha-exporter-script-configmap.yaml b/...s/redis-ha-exporter-script-configmap.yaml → ...s/redis-ha-exporter-script-configmap.yaml
diff --git a/.../templates/redis-ha-health-configmap.yaml → .../templates/redis-ha-health-configmap.yaml b/.../templates/redis-ha-health-configmap.yaml → .../templates/redis-ha-health-configmap.yaml
diff --git a/...ha/templates/redis-ha-network-policy.yaml → ...ha/templates/redis-ha-network-policy.yaml b/...ha/templates/redis-ha-network-policy.yaml → ...ha/templates/redis-ha-network-policy.yaml
diff --git a/redis-ha/templates/redis-ha-pdb.yaml → charts/redis-ha/templates/redis-ha-pdb.yaml b/redis-ha/templates/redis-ha-pdb.yaml → charts/redis-ha/templates/redis-ha-pdb.yaml
diff --git a/...a/templates/redis-ha-prometheus-rule.yaml → ...a/templates/redis-ha-prometheus-rule.yaml b/...a/templates/redis-ha-prometheus-rule.yaml → ...a/templates/redis-ha-prometheus-rule.yaml
diff --git a/redis-ha/templates/redis-ha-role.yaml → charts/redis-ha/templates/redis-ha-role.yaml b/redis-ha/templates/redis-ha-role.yaml → charts/redis-ha/templates/redis-ha-role.yaml
diff --git a/redis-ha/templates/redis-ha-rolebinding.yaml → ...is-ha/templates/redis-ha-rolebinding.yaml b/redis-ha/templates/redis-ha-rolebinding.yaml → ...is-ha/templates/redis-ha-rolebinding.yaml
diff --git a/redis-ha/templates/redis-ha-secret.yaml → ...s/redis-ha/templates/redis-ha-secret.yaml b/redis-ha/templates/redis-ha-secret.yaml → ...s/redis-ha/templates/redis-ha-secret.yaml
diff --git a/...s/redis-ha-sentinel-announce-service.yaml → ...s/redis-ha-sentinel-announce-service.yaml b/...s/redis-ha-sentinel-announce-service.yaml → ...s/redis-ha-sentinel-announce-service.yaml
diff --git a/.../templates/redis-ha-sentinel-service.yaml → .../templates/redis-ha-sentinel-service.yaml b/.../templates/redis-ha-sentinel-service.yaml → .../templates/redis-ha-sentinel-service.yaml
diff --git a/...plates/redis-ha-sentinel-statefulset.yaml → ...plates/redis-ha-sentinel-statefulset.yaml b/...plates/redis-ha-sentinel-statefulset.yaml → ...plates/redis-ha-sentinel-statefulset.yaml
@@ -180,7 +180,7 @@ spec:
         {{- if .Values.redis.tlsPort }}
         - mountPath: /tls-certs
           name: tls-certs
-        {{- end}}
+        {{- end }}
 {{- if .Values.extraInitContainers }}
 {{- toYaml .Values.extraInitContainers | nindent 6 }}
 {{- end }}
@@ -377,40 +377,7 @@ spec:
           defaultMode: 0755
 {{- if .Values.extraVolumes }}
 {{- toYaml .Values.extraVolumes | nindent 6 }}
-{{- end -}}
-{{- if .Values.persistentVolume.enabled }}
-  volumeClaimTemplates:
-  - apiVersion: v1
-    kind: PersistentVolumeClaim
-    metadata:
-      name: data
-      annotations:
-      {{- range $key, $value := .Values.persistentVolume.annotations }}
-        {{ $key }}: {{ $value }}
-      {{- end }}
-      labels: {{- toYaml .Values.persistentVolume.labels | nindent 8 }}
-
-    spec:
-      accessModes:
-      {{- range .Values.persistentVolume.accessModes }}
-        - {{ . | quote }}
-      {{- end }}
-      resources:
-        requests:
-          storage: {{ .Values.persistentVolume.size | quote }}
-    {{- if .Values.persistentVolume.storageClass }}
-    {{- if (eq "-" .Values.persistentVolume.storageClass) }}
-      storageClassName: ""
-    {{- else }}
-      storageClassName: "{{ .Values.persistentVolume.storageClass }}"
-    {{- end }}
 {{- end }}
-{{- else if .Values.hostPath.path }}
-      - name: data
-        hostPath:
-          path: {{ tpl .Values.hostPath.path .}}
-{{- else }}
       - name: data
         emptyDir:
 {{ toYaml .Values.emptyDir | indent 10 }}
-{{- end }}
diff --git a/redis-ha/templates/redis-ha-service.yaml → .../redis-ha/templates/redis-ha-service.yaml b/redis-ha/templates/redis-ha-service.yaml → .../redis-ha/templates/redis-ha-service.yaml
diff --git a/...ha/templates/redis-ha-serviceaccount.yaml → ...ha/templates/redis-ha-serviceaccount.yaml b/...ha/templates/redis-ha-serviceaccount.yaml → ...ha/templates/redis-ha-serviceaccount.yaml
diff --git a/...ha/templates/redis-ha-servicemonitor.yaml → ...ha/templates/redis-ha-servicemonitor.yaml b/...ha/templates/redis-ha-servicemonitor.yaml → ...ha/templates/redis-ha-servicemonitor.yaml
diff --git a/redis-ha/templates/redis-ha-statefulset.yaml → ...is-ha/templates/redis-ha-statefulset.yaml b/redis-ha/templates/redis-ha-statefulset.yaml → ...is-ha/templates/redis-ha-statefulset.yaml
diff --git a/...a/templates/redis-haproxy-deployment.yaml → ...a/templates/redis-haproxy-deployment.yaml b/...a/templates/redis-haproxy-deployment.yaml → ...a/templates/redis-haproxy-deployment.yaml
diff --git a/...mplates/redis-haproxy-network-policy.yaml → ...mplates/redis-haproxy-network-policy.yaml b/...mplates/redis-haproxy-network-policy.yaml → ...mplates/redis-haproxy-network-policy.yaml
diff --git a/redis-ha/templates/redis-haproxy-pdb.yaml → ...redis-ha/templates/redis-haproxy-pdb.yaml b/redis-ha/templates/redis-haproxy-pdb.yaml → ...redis-ha/templates/redis-haproxy-pdb.yaml
diff --git a/redis-ha/templates/redis-haproxy-role.yaml → ...edis-ha/templates/redis-haproxy-role.yaml b/redis-ha/templates/redis-haproxy-role.yaml → ...edis-ha/templates/redis-haproxy-role.yaml
diff --git a/.../templates/redis-haproxy-rolebinding.yaml → .../templates/redis-haproxy-rolebinding.yaml b/.../templates/redis-haproxy-rolebinding.yaml → .../templates/redis-haproxy-rolebinding.yaml
diff --git a/...s-ha/templates/redis-haproxy-service.yaml → ...s-ha/templates/redis-haproxy-service.yaml b/...s-ha/templates/redis-haproxy-service.yaml → ...s-ha/templates/redis-haproxy-service.yaml
diff --git a/...mplates/redis-haproxy-serviceaccount.yaml → ...mplates/redis-haproxy-serviceaccount.yaml b/...mplates/redis-haproxy-serviceaccount.yaml → ...mplates/redis-haproxy-serviceaccount.yaml
diff --git a/...mplates/redis-haproxy-servicemonitor.yaml → ...mplates/redis-haproxy-servicemonitor.yaml b/...mplates/redis-haproxy-servicemonitor.yaml → ...mplates/redis-haproxy-servicemonitor.yaml
diff --git a/redis-ha/templates/redis-tls-secret.yaml → .../redis-ha/templates/redis-tls-secret.yaml b/redis-ha/templates/redis-tls-secret.yaml → .../redis-ha/templates/redis-tls-secret.yaml
diff --git a/redis-ha/templates/sentinel-auth-secret.yaml → ...is-ha/templates/sentinel-auth-secret.yaml b/redis-ha/templates/sentinel-auth-secret.yaml → ...is-ha/templates/sentinel-auth-secret.yaml
diff --git a/...plates/tests/test-redis-ha-configmap.yaml → ...plates/tests/test-redis-ha-configmap.yaml b/...plates/tests/test-redis-ha-configmap.yaml → ...plates/tests/test-redis-ha-configmap.yaml
diff --git a/...ha/templates/tests/test-redis-ha-pod.yaml → ...ha/templates/tests/test-redis-ha-pod.yaml b/...ha/templates/tests/test-redis-ha-pod.yaml → ...ha/templates/tests/test-redis-ha-pod.yaml
diff --git a/redis-ha/values.yaml → charts/redis-ha/values.yaml b/redis-ha/values.yaml → charts/redis-ha/values.yaml