refactor sentinel

charts/redis-replication/templates/_helpers.tpl

@@ -9,14 +9,6 @@ Expand the names
   {{- end }}
 {{- end }}
 
-{{- define "redis.sentinelName" -}}
-  {{- if .Values.sentinelNameOverride }}
-    {{- .Values.sentinelNameOverride | trunc 63 | trimSuffix "-" }}
-  {{- else }}
-    {{- printf "redis-sentinel-%s" .Release.Name -}}
-  {{- end }}
-{{- end }}
-
 {{/*
 Allow the release namespace to be overridden for multi-namespace deployments in combined charts
 */}}
@@ -57,9 +49,3 @@ app.kubernetes.io/name: {{ include "redis.replicationName" $ }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
-
-{{- define "redis.sentinelSelectorLabels" -}}
-app.kubernetes.io/name: {{ include "redis.sentinelName" $ }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-app.kubernetes.io/part-of: {{ .Release.Name }}
-{{- end }}

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

@@ -20,9 +20,8 @@ spec:
     resources:
     {{- with .Values.redisReplication.resources }}
       {{- toYaml . | nindent 6 }}
-    {{ end }}
-
-    {{ if .Values.existingSecret.enabled }}
+    {{- end }}
+    {{- if .Values.existingSecret.enabled }}
     redisSecret:
       name: {{ .Values.existingSecret.name }}
       key: {{ .Values.existingSecret.key }}
@@ -38,10 +37,10 @@ spec:
     enabled: {{ .Values.redisReplication.redisExporter.enabled }}
     image: "{{ .Values.redisReplication.redisExporter.image.repository }}:{{ .Values.redisReplication.redisExporter.image.tag }}"
 
-  {{- if .Values.redisSentinel.enabled }}
+  {{- if .Values.redisReplication.sentinel.enabled }}
   sentinel:
-    image: "{{ .Values.redisSentinel.image.repository }}:{{ .Values.redisSentinel.image.tag }}"
-    imagePullPolicy: {{ .Values.redisSentinel.image.pullPolicy }}
+    image: "{{ .Values.redisReplication.sentinel.image.repository }}:{{ .Values.redisReplication.sentinel.image.tag }}"
+    imagePullPolicy: {{ .Values.redisReplication.sentinel.image.pullPolicy }}
 
     {{ if .Values.existingSecret.enabled }}
     redisSecret:
@@ -50,9 +49,9 @@ spec:
     {{- end }}
 
     resources:
-    {{- with .Values.redisSentinel.resources }}
+    {{- with .Values.redisReplication.sentinel.resources }}
       {{- toYaml . | nindent 10 }}
     {{- end }}
 
-    size: {{ .Values.redisSentinel.clusterSize }}
+    size: {{ .Values.redisReplication.sentinel.size }}
   {{- end }}