Added name overwrite function to redis charts (OT-CONTAINER-KIT#168)

* fix redis-sentinel selector role value (OT-CONTAINER-KIT#164) * fix redis-sentinel selector role value Signed-off-by: whzghb <631064936@qq.com> * fix lints Signed-off-by: Shubham Gupta <iamshubhamgupta2001@gmail.com> * fix linl-2 Signed-off-by: Shubham Gupta <iamshubhamgupta2001@gmail.com> --------- Signed-off-by: whzghb <631064936@qq.com> Signed-off-by: Shubham Gupta <iamshubhamgupta2001@gmail.com> Co-authored-by: Shubham Gupta <iamshubhamgupta2001@gmail.com> Signed-off-by: EStork09 <estork@live.com> * Added name overwrite function to redis charts Signed-off-by: EStork09 <estork@live.com> * Bumpped versions Signed-off-by: EStork09 <estork@live.com> * Moved fields for name under specific configuration Signed-off-by: EStork09 <estork@live.com> * Adjusted values.yaml to address linting report Signed-off-by: EStork09 <estork@live.com> * Addressed linting errors Signed-off-by: EStork09 <estork@live.com> --------- Signed-off-by: whzghb <631064936@qq.com> Signed-off-by: Shubham Gupta <iamshubhamgupta2001@gmail.com> Signed-off-by: EStork09 <estork@live.com> Co-authored-by: whzghb <41436057+whzghb@users.noreply.github.com> Co-authored-by: Shubham Gupta <iamshubhamgupta2001@gmail.com> Signed-off-by: Sébastien HO <sho@smartadserver.com>
mrhovunping · Nov 28, 2023 · 452b2c9 · 452b2c9
1 parent ba4ca84
commit 452b2c9
Show file tree

Hide file tree

Showing 29 changed files with 98 additions and 86 deletions.
diff --git a/charts/redis-cluster/Chart.yaml b/charts/redis-cluster/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: redis-cluster
 description: Provides easy redis setup definitions for Kubernetes services, and deployment.
-version: 0.15.9
+version: 0.15.10
 appVersion: "0.15.1"
 home: https://github.com/ot-container-kit/redis-operator
 sources:

diff --git a/charts/redis-cluster/README.md b/charts/redis-cluster/README.md
@@ -43,6 +43,7 @@ helm delete <my-release> --namespace <namespace>
 | `redisCluster.imagePullPolicy`     | IfNotPresent                   | Image Pull Policy of the redis image                                                          |
 | `redisCluster.leaderServiceType`   | ClusterIP                      | Kubernetes service type for Redis Leader                                                      |
 | `redisCluster.followerServiceType` | ClusterIP                      | Kubernetes service type for Redis Follower                                                    |
+| `redisCluster.name`                            | ""                             | Overwrites the name for the charts resources instead of the Release name |
 | `externalService.enabled`          | false                          | If redis service needs to be exposed using LoadBalancer or NodePort                           |
 | `externalService.annotations`      | {}                             | Kubernetes service related annotations                                                        |
 | `externalService.serviceType`      | NodePort                       | Kubernetes service type for exposing service, values - ClusterIP, NodePort, and LoadBalancer  |

diff --git a/charts/redis-cluster/templates/_helpers.tpl b/charts/redis-cluster/templates/_helpers.tpl
@@ -2,10 +2,10 @@
 
 {{/* Define common labels */}}
 {{- define "common.labels" -}}
-app.kubernetes.io/name: {{ .Release.Name }}
+app.kubernetes.io/name: {{ .Values.redisCluster.name | default .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/instance: {{ .Values.redisCluster.name | default .Release.Name }}
 app.kubernetes.io/version: {{ .Chart.AppVersion }}
 app.kubernetes.io/component: middleware
 {{- if .Values.labels }}

diff --git a/charts/redis-cluster/templates/extra-config.yaml b/charts/redis-cluster/templates/extra-config.yaml
@@ -3,12 +3,12 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Release.Name }}-ext-config
+  name: {{ .Values.redisCluster.name | default .Release.Name }}-ext-config
   labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ .Values.redisCluster.name | default .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/instance: {{ .Values.redisCluster.name | default .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: middleware
 data:

diff --git a/charts/redis-cluster/templates/follower-service.yaml b/charts/redis-cluster/templates/follower-service.yaml
@@ -3,22 +3,22 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}-follower-external-service
+  name: {{ .Values.redisCluster.name | default .Release.Name }}-follower-external-service
 {{- if .Values.externalService.annotations }}
   annotations:
 {{ toYaml .Values.externalService.annotations | indent 4 }}
 {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ .Values.redisCluster.name | default .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/instance: {{ .Values.redisCluster.name | default .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: middleware
 spec:
   type: {{ .Values.externalService.serviceType }}
   selector:
-    app: {{ .Release.Name }}-follower
+    app: {{ .Values.redisCluster.name | default .Release.Name }}-follower
     redis_setup_type: cluster
     role: follower
   ports:

diff --git a/charts/redis-cluster/templates/follower-sm.yaml b/charts/redis-cluster/templates/follower-sm.yaml
@@ -3,18 +3,18 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ .Release.Name }}-follower-prometheus-monitoring
+  name: {{ .Values.redisCluster.name | default .Release.Name }}-follower-prometheus-monitoring
   labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ .Values.redisCluster.name | default .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/instance: {{ .Values.redisCluster.name | default .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: middleware
 spec:
   selector:
     matchLabels:
-      app: {{ .Release.Name }}-follower
+      app: {{ .Values.redisCluster.name | default .Release.Name }}-follower
       redis_setup_type: cluster
       role: follower
   endpoints:

diff --git a/charts/redis-cluster/templates/leader-service.yaml b/charts/redis-cluster/templates/leader-service.yaml
@@ -3,22 +3,22 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}-leader-external-service
+  name: {{ .Values.redisCluster.name | default .Release.Name }}-leader-external-service
 {{- if .Values.externalService.annotations }}
   annotations:
 {{ toYaml .Values.externalService.annotations | indent 4 }}
 {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ .Values.redisCluster.name | default .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/instance: {{ .Values.redisCluster.name | default .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: middleware
 spec:
   type: {{ .Values.externalService.serviceType }}
   selector:
-    app: {{ .Release.Name }}-leader
+    app: {{ .Values.redisCluster.name | default .Release.Name }}-leader
     redis_setup_type: cluster
     role: leader
   ports:

diff --git a/charts/redis-cluster/templates/leader-sm.yaml b/charts/redis-cluster/templates/leader-sm.yaml
@@ -3,18 +3,18 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ .Release.Name }}-leader-prometheus-monitoring
+  name: {{ .Values.redisCluster.name | default .Release.Name }}-leader-prometheus-monitoring
   labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ .Values.redisCluster.name | default .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/instance: {{ .Values.redisCluster.name | default .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: middleware
 spec:
   selector:
     matchLabels:
-      app: {{ .Release.Name }}-leader
+      app: {{ .Values.redisCluster.name | default .Release.Name }}-leader
       redis_setup_type: cluster
       role: leader
   endpoints:

diff --git a/charts/redis-cluster/templates/redis-cluster.yaml b/charts/redis-cluster/templates/redis-cluster.yaml
@@ -2,7 +2,7 @@
 apiVersion: redis.redis.opstreelabs.in/v1beta2
 kind: RedisCluster
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ .Values.redisCluster.name | default .Release.Name }}
   labels: {{- include "common.labels" . | nindent 4 }}
 spec:
   clusterSize: {{ .Values.redisCluster.clusterSize }}
@@ -13,14 +13,14 @@ spec:
     replicas: {{ .Values.redisCluster.leader.replicas }}
   {{- if .Values.externalConfig.enabled }}
     redisConfig:
-      additionalRedisConfig: "{{ .Release.Name }}-ext-config"
+      additionalRedisConfig: "{{ .Values.redisCluster.name | default .Release.Name }}-ext-config"
   {{- end }}
 
   redisFollower: {{-  include "redis.role" .Values.redisCluster.follower | nindent 4 }}
     replicas: {{ .Values.redisCluster.follower.replicas }}
   {{- if .Values.externalConfig.enabled }}
     redisConfig:
-      additionalRedisConfig: "{{ .Release.Name }}-ext-config"
+      additionalRedisConfig: "{{ .Values.redisCluster.name | default .Release.Name }}-ext-config"
   {{- end }}
 
   redisExporter:

diff --git a/charts/redis-cluster/values.yaml b/charts/redis-cluster/values.yaml
@@ -1,5 +1,6 @@
 ---
 redisCluster:
+  name: ""
   clusterSize: 3
   clusterVersion: v7
   persistenceEnabled: true
@@ -37,7 +38,7 @@ redisCluster:
       #   effect: "NoSchedule"
     nodeSelector: null
       # memory: medium
-    securityContext : {}
+    securityContext: {}
     pdb:
       enabled: false
       maxUnavailable: 1
@@ -62,7 +63,7 @@ redisCluster:
       #   effect: "NoSchedule"
     nodeSelector: null
       # memory: medium
-    securityContext : {}
+    securityContext: {}
     pdb:
       enabled: false
       maxUnavailable: 1
@@ -125,7 +126,7 @@ sidecars:
     #   value: "my-env-var-value"
 
 initContainer:
-  enabled: false  
+  enabled: false
   image: ""
   imagePullPolicy: "IfNotPresent"
   resources: {}
@@ -172,12 +173,12 @@ TLS:
   secret:
     secretName: ""
 
-acl : 
-  secret : 
+acl:
+  secret:
     secretName: ""
 
-env : []
+env: []
   # - name: VAR_NAME
   #   value: "value1"
 
-serviceAccountName : ""
+serviceAccountName: ""
diff --git a/charts/redis-replication/Chart.yaml b/charts/redis-replication/Chart.yaml
@@ -9,7 +9,7 @@ maintainers:
   - name: shubham-cmyk
 sources:
   - https://github.com/ot-container-kit/redis-operator
-version: 0.15.9
+version: 0.15.10
 appVersion: "0.15.1"
 home: https://github.com/ot-container-kit/redis-operator
 keywords:

diff --git a/charts/redis-replication/templates/extra-config.yaml b/charts/redis-replication/templates/extra-config.yaml
@@ -3,12 +3,12 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Release.Name }}-ext-config
+  name: {{ .Values.redisReplication.name | default .Release.Name }}-ext-config
   labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ .Values.redisReplication.name | default .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/instance: {{ .Values.redisReplication.name | default .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: middleware
 data:

diff --git a/charts/redis-replication/templates/redis-replication.yaml b/charts/redis-replication/templates/redis-replication.yaml
@@ -2,7 +2,7 @@
 apiVersion: redis.redis.opstreelabs.in/v1beta2
 kind: RedisReplication
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ .Values.redisReplication.name | default .Release.Name }}
   labels: {{- include "common.labels" . | nindent 4 }}
 spec:
   clusterSize: {{ .Values.redisReplication.clusterSize }}  
@@ -37,7 +37,7 @@ spec:
 
   {{- if .Values.externalConfig.enabled }}
     redisConfig:
-      additionalRedisConfig: "{{ .Release.Name }}-ext-config"
+      additionalRedisConfig: "{{ .Values.redisReplication.name | default .Release.Name }}-ext-config"
   {{- end }}
   {{- if .Values.storageSpec }}
   storage: {{ toYaml .Values.storageSpec | nindent 4 }}

diff --git a/charts/redis-replication/templates/replication-service.yaml b/charts/redis-replication/templates/replication-service.yaml
@@ -3,22 +3,22 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}-external-service
+  name: {{ .Values.redisReplication.name | default .Release.Name }}-external-service
 {{- if .Values.externalService.annotations }}
   annotations:
 {{ toYaml .Values.externalService.annotations | indent 4 }}
 {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ .Values.redisReplication.name | default .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/instance: {{ .Values.redisReplication.name | default .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: middleware
 spec:
   type: {{ .Values.externalService.serviceType }}
   selector:
-    app: {{ .Release.Name }}
+    app: {{ .Values.redisReplication.name | default .Release.Name }}
     redis_setup_type: replication
     role: replication
   ports:

diff --git a/charts/redis-replication/templates/servicemonitor.yaml b/charts/redis-replication/templates/servicemonitor.yaml
@@ -3,18 +3,18 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ .Release.Name }}-prometheus-monitoring
+  name: {{ .Values.redisReplication.name | default .Release.Name }}-prometheus-monitoring
   labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ .Values.redisReplication.name | default .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/instance: {{ .Values.redisReplication.name | default .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: middleware
 spec:
   selector:
     matchLabels:
-      app: {{ .Release.Name }}
+      app: {{ .Values.redisReplication.name | default .Release.Name }}
       redis_setup_type: replication
       role: replication
   endpoints:

diff --git a/charts/redis-replication/values.yaml b/charts/redis-replication/values.yaml
@@ -1,5 +1,6 @@
 ---
 redisReplication:
+  name: ""
   clusterSize: 3
   image: quay.io/opstree/redis
   tag: v7.0.12
@@ -20,6 +21,9 @@ redisReplication:
   ignoreAnnotations: []
     # - "redis.opstreelabs.in/ignore"
 
+# Overwite name for resources
+# name: ""
+
 labels: {}
 #   foo: bar
 #   test: echo
@@ -61,7 +65,7 @@ redisExporter:
     #   value: "value1"
 
 initContainer:
-  enabled: false  
+  enabled: false
   image: ""
   imagePullPolicy: "IfNotPresent"
   resources: {}
@@ -109,7 +113,7 @@ podSecurityContext:
   runAsUser: 1000
   fsGroup: 1000
 
-securityContext : {}
+securityContext: {}
 
 affinity: {}
   # nodeAffinity:
@@ -127,7 +131,7 @@ tolerations: []
   #   value: "value"
   #   effect: "NoSchedule"
 
-serviceAccountName : ""
+serviceAccountName: ""
 
 TLS:
   ca: ca.key
@@ -136,10 +140,10 @@ TLS:
   secret:
     secretName: ""
 
-acl : 
-  secret : 
+acl:
+  secret:
     secretName: ""
 
-env : []
+env: []
   # - name: VAR_NAME
   #   value: "value1"
diff --git a/charts/redis-sentinel/Chart.yaml b/charts/redis-sentinel/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: redis-sentinel
 description: Provides easy redis setup definitions for Kubernetes services, and deployment.
-version: 0.15.10
+version: 0.15.11
 appVersion: "0.15.1"
 home: https://github.com/ot-container-kit/redis-operator
 sources:

diff --git a/charts/redis-sentinel/templates/extra-config.yaml b/charts/redis-sentinel/templates/extra-config.yaml
@@ -3,12 +3,12 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Release.Name }}-ext-config
+  name: {{ .Values.redisSentinel.name | default .Release.Name }}-ext-config
   labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ .Values.redisSentinel.name | default .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/instance: {{ .Values.redisSentinel.name | default .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: middleware
 data: