remove sentinel

charts/redis-replication/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: redis-replication
-version: 0.6.0
+version: 0.7.0
 description: Redis Replication with Sentinel
 keywords:
   - redis-operator

charts/redis-replication/README.md

@@ -1,6 +1,6 @@
 # redis-replication
 
-![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![AppVersion: v0.23.0](https://img.shields.io/badge/AppVersion-v0.23.0-informational?style=flat-square)
+![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![AppVersion: v0.23.0](https://img.shields.io/badge/AppVersion-v0.23.0-informational?style=flat-square)
 
 Redis Replication with Sentinel
 

charts/redis-replication/templates/redis-replication.yaml

@@ -12,7 +12,7 @@ spec:
   podSecurityContext:
   {{- with .Values.redisReplication.podSecurityContext }}
     {{- toYaml . | nindent 4 }}
-  {{ end }}
+  {{- end }}
 
   kubernetesConfig:
     image: "{{ .Values.redisReplication.image.repository }}:{{ .Values.redisReplication.image.tag }}"
@@ -26,13 +26,13 @@ spec:
     redisSecret:
       name: {{ .Values.existingSecret.name }}
       key: {{ .Values.existingSecret.key }}
-    {{ end }}
+    {{- end }}
 
   storage:
     volumeClaimTemplate:
     {{- with .Values.redisReplication.volumeClaimTemplate }}
       {{- toYaml . | nindent 6 }}
-    {{ end }}
+    {{- end }}
 
   redisExporter:
     enabled: {{ .Values.redisReplication.redisExporter.enabled }}
@@ -47,12 +47,12 @@ spec:
     redisSecret:
       name: {{ .Values.existingSecret.name }}
       key: {{ .Values.existingSecret.key }}
-    {{ end }}
+    {{- end }}
 
     resources:
     {{- with .Values.redisSentinel.resources }}
       {{- toYaml . | nindent 10 }}
-    {{ end }}
+    {{- end }}
 
     size: {{ .Values.redisSentinel.clusterSize }}
   {{- end }}

charts/redis-replication/templates/redis-sentinel.yaml

@@ -1,46 +0,0 @@
-# {{- if .Values.redisSentinel.enabled }}
-# ---
-# apiVersion: redis.redis.opstreelabs.in/v1beta2
-# kind: RedisSentinel
-# metadata:
-#   name: {{ include "redis.sentinelName" . }}
-#   namespace: {{ include "redis.namespace" . }}
-#   labels:
-#     {{- include "redis.labels" . | nindent 4 }}
-#     {{- include "redis.sentinelSelectorLabels" . | nindent 4 }}
-# spec:
-#   clusterSize: {{ .Values.redisSentinel.clusterSize }}
-
-#   podSecurityContext:
-#   {{- with .Values.redisSentinel.podSecurityContext }}
-#     {{- toYaml . | nindent 10 }}
-#   {{ end }}
-
-#   redisSentinelConfig:
-#     redisReplicationName: {{ include "redis.replicationName" . }}
-#     {{ if .Values.existingSecret.enabled }}
-#     redisReplicationPassword:
-#       secretKeyRef:
-#         name: {{ .Values.existingSecret.name }}
-#         key: {{ .Values.existingSecret.key }}
-#     {{ end }}
-
-#   kubernetesConfig:
-#     image: "{{ .Values.redisSentinel.image.repository }}:{{ .Values.redisSentinel.image.tag }}"
-#     imagePullPolicy: {{ .Values.redisSentinel.image.pullPolicy }}
-#     resources:
-#     {{- with .Values.redisSentinel.resources }}
-#       {{- toYaml . | nindent 10 }}
-#     {{ end }}
-
-#     {{ if .Values.existingSecret.enabled }}
-#     redisSecret:
-#       name: {{ .Values.existingSecret.name }}
-#       key: {{ .Values.existingSecret.key }}
-#     {{ end }}
-
-#   redisExporter:
-#     enabled: {{ .Values.redisSentinel.redisExporter.enabled }}
-#     image: "{{ .Values.redisSentinel.redisExporter.image.repository }}:{{ .Values.redisSentinel.redisExporter.image.tag }}"
-
-# {{- end }}

charts/redis-replication/templates/service-monitor.yaml

@@ -22,28 +22,3 @@ spec:
       interval: {{ .Values.redisReplication.redisExporter.serviceMonitor.interval }}
       scrapeTimeout: {{ .Values.redisReplication.redisExporter.serviceMonitor.scrapeTimeout }}
 {{- end }}
-
-# {{- if and (.Values.redisSentinel.redisExporter.serviceMonitor.enabled) (.Values.redisSentinel.enabled) }}
-# ---
-# apiVersion: monitoring.coreos.com/v1
-# kind: ServiceMonitor
-# metadata:
-#   name: {{ include "redis.sentinelName" . }}
-#   namespace: {{ include "redis.namespace" . }}
-#   labels:
-#     {{- include "redis.labels" . | nindent 4 }}
-#     {{- include "redis.sentinelSelectorLabels" . | nindent 4 }}
-#     {{- with .Values.redisSentinel.redisExporter.serviceMonitor.extraLabels }}
-#     {{- toYaml . | nindent 4 }}
-#     {{- end }}
-# spec:
-#   selector:
-#     matchLabels:
-#       app: {{ include "redis.sentinelName" . }}
-#       redis_setup_type: sentinel
-#       role: sentinel
-#   endpoints:
-#     - port: redis-exporter
-#       interval: {{ .Values.redisSentinel.redisExporter.serviceMonitor.interval }}
-#       scrapeTimeout: {{ .Values.redisSentinel.redisExporter.serviceMonitor.scrapeTimeout }}
-# {{- end }}