Updated redis helm chart for v0.7.0

Signed-off-by: iamabhishek-dubey <[email protected]>

charts/redis/Chart.yaml

@@ -7,8 +7,8 @@ maintainers:
 name: redis
 sources:
   - https://github.com/ot-container-kit/redis-operator
-version: 0.6.0
-appVersion: "0.6.0"
+version: 0.7.0
+appVersion: "0.7.0"
 home: https://github.com/ot-container-kit/redis-operator
 keywords:
 - operator

charts/redis/templates/redis-standalone.yaml

@@ -17,17 +17,27 @@ spec:
     imagePullPolicy: "{{ .Values.redisExporter.imagePullPolicy }}"
     resources:
 {{ toYaml .Values.redisExporter.resources | indent 6 }}
+{{- if .Values.redisExporter.env }}
+    env:
+{{ toYaml .Values.redisExporter.env | indent 4 }}
+{{- end }}
   kubernetesConfig:
     image: "{{ .Values.redisStandalone.image }}:{{ .Values.redisStandalone.tag }}"
     imagePullPolicy: "{{ .Values.redisStandalone.imagePullPolicy }}"
     resources:
 {{ toYaml .Values.redisStandalone.resources | indent 6 }}
-{{- if .Values.redisCluster.redisSecret }}
+{{- if .Values.redisStandalone.redisSecret }}
     redisSecret:
-      name: "{{ .Values.redisCluster.redisSecret.secretName }}"
-      key: "{{ .Values.redisCluster.redisSecret.secretKey }}"
+      name: "{{ .Values.redisStandalone.redisSecret.secretName }}"
+      key: "{{ .Values.redisStandalone.redisSecret.secretKey }}"
 {{- end }}
     serviceType: "{{ .Values.redisStandalone.serviceType }}"
+{{- if .Values.imagePullSecrets }}
+    imagePullSecrets:
+{{- range $imageSecrets := .Values.imagePullSecrets }}
+    - name: {{ $imageSecrets.name }}
+{{- end }}
+{{- end }}
   redisConfig: {}
 {{- if .Values.storageSpec }}
   storage:

charts/redis/templates/service.yaml

@@ -0,0 +1,29 @@
+{{- if eq .Values.externalService.enabled true }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}-external-service
+{{- if .Values.externalService.annotations }}
+  annotations:
+{{ toYaml .Values.externalService.annotations | indent 4 }}
+{{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Release.Name }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: middleware
+spec:
+  type: {{ .Values.externalService.serviceType }}
+  selector:
+    app: {{ .Release.Name }}
+    redis_setup_type: standalone
+    role: standalone
+  ports:
+    - protocol: TCP
+      port: {{ .Values.externalService.port }}
+      targetPort: 6379
+      name: client
+{{- end }}

charts/redis/templates/servicemonitor.yaml

@@ -0,0 +1,27 @@
+{{- if eq .Values.serviceMonitor.enabled true }}
+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ .Release.Name }}-prometheus-monitoring
+  labels:
+    app.kubernetes.io/name: {{ .Release.Name }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: middleware
+spec:
+  selector:
+    matchLabels:
+    app: {{ .Release.Name }}
+    redis_setup_type: standalone
+    role: standalone
+  endpoints:
+  - port: redis-exporter
+    interval: {{ .Values.serviceMonitor.interval }}
+    scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
+  namespaceSelector:
+    matchNames:
+    - {{ .Values.serviceMonitor.namespace }}
+{{- end }}

charts/redis/values.yaml

@@ -14,6 +14,18 @@ redisStandalone:
     # limits:
     #   cpu: 100m
     #   memory: 128Mi
+externalService:
+  enabled: false
+  # annotations:
+  #   foo: bar
+  serviceType: NodePort
+  port: 6379
+
+serviceMonitor:
+  enabled: false
+  interval: 30s
+  scrapeTimeout: 10s
+  namespace: monitoring
 
 redisExporter:
   enabled: true
@@ -27,9 +39,25 @@ redisExporter:
     # limits:
     #   cpu: 100m
     #   memory: 128Mi
+  # env:
+  # - name: REDIS_EXPORTER_INCL_SYSTEM_METRICS
+  #   value: "true"
+  # - name: UI_PROPERTIES_FILE_NAME
+  #   valueFrom:
+  #     configMapKeyRef:
+  #       name: game-demo
+  #       key: ui_properties_file_name
+  # - name: SECRET_USERNAME
+  #   valueFrom:
+  #     secretKeyRef:
+  #       name: mysecret
+  #       key: username
 
 # priorityClassName: "-"
 
+# imagePullSecrets:
+#  - name: regcred
+
 nodeSelector: {}
   # memory: medium