BUG-176: Fix bug with initContainer and sidecar properties

.github/workflows/lint-test.yaml

@@ -11,19 +11,28 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Set up Helm
+
+      - name: Install Helm
         uses: azure/setup-helm@v3
         with:
-          version: v3.5.0
+          version: v3.5.4
+
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: '3.9'
+          check-latest: true
+
       - name: Set up chart-testing
-        uses: helm/[email protected]
+        uses: helm/[email protected]
+
       - name: Run chart-testing (list-changed)
         id: list-changed
         run: |
           changed=$(ct list-changed --config ct.yaml)
           if [[ -n "$changed" ]]; then
-            echo "::set-output name=changed::true"
-          fi
+            echo "changed=true" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Run chart-testing (lint)
+        run: |
+          ct lint --config ct.yaml

.github/workflows/release.yaml

@@ -33,7 +33,7 @@ jobs:
           check-latest: true
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.4.0
+        uses: helm/chart-testing-action@v2.6.0
 
       - name: Add Helm Repository
         run: |
@@ -50,7 +50,7 @@ jobs:
         run: |
           changed_charts=$(ct list-changed --config ct.yaml)
           echo "Changed charts: $changed_charts"
-          echo "::set-output name=changed_charts::$changed_charts"
+          echo "changed_charts=$changed_charts" >> $GITHUB_ENV
 
       - name: Package and Release Charts
         run: |

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.11
 appVersion: "0.15.1"
 home: https://github.com/ot-container-kit/redis-operator
 sources:

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  |

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 }}

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:

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:

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:

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:

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:

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:
@@ -45,8 +45,8 @@ spec:
     {{- end }}
     {{- if and .Values.redisCluster.redisSecret.secretName .Values.redisCluster.redisSecret.secretKey }}
     redisSecret:
-      name: "{{ .Values.redisCluster.redisSecret.secretName | quote }}"
-      key: "{{ .Values.redisCluster.redisSecret.secretKey | quote }}"
+      name: {{ .Values.redisCluster.redisSecret.secretName | quote }}
+      key: {{ .Values.redisCluster.redisSecret.secretKey | quote }}
     {{- end }}
 
   {{- if .Values.storageSpec }}
@@ -72,14 +72,14 @@ spec:
       secretName: {{ .Values.acl.secret.secretName | quote }}
   {{- end }}
   {{- if and .Values.sidecars (ne .Values.sidecars.name "") (ne .Values.sidecars.image "") }}
-  sidecars: {{ include "sidecar.properties" | nindent 4 }}
+  sidecars: {{ include "sidecar.properties" . | nindent 4 }}
   {{- end }}
   {{- if and .Values.initContainer .Values.initContainer.enabled (ne .Values.initContainer.image "") }}
-  initContainer: {{ include "initContainer.properties" | nindent 4 }}
+  initContainer: {{ include "initContainer.properties" . | nindent 4 }}
   {{- end }}
   {{- if .Values.env }}
   env: {{ toYaml .Values.env | nindent 4 }}
   {{- end }}
   {{- if and .Values.serviceAccountName (ne .Values.serviceAccountName "") }}
   serviceAccountName: "{{ .Values.serviceAccountName }}"
-  {{- end }}
+  {{- end }}

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: ""

charts/redis-operator/Chart.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: v2
-version: 0.15.9
+version: 0.15.10
 appVersion: "0.15.1"
 description: Provides easy redis setup definitions for Kubernetes services, and deployment.
 engine: gotpl

charts/redis-operator/templates/operator-deployment.yaml

@@ -59,6 +59,10 @@ spec:
       {{- with .Values.nodeSelector }}
       nodeSelector: {{ toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.tolerations }}
+      tolerations:
+      {{ toYaml .Values.tolerations | indent 8 }}
+      {{- end }}    
       {{- if .Values.priorityClassName}}
       priorityClassName: {{ .Values.priorityClassName }}
       {{- end }}

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.11
 appVersion: "0.15.1"
 home: https://github.com/ot-container-kit/redis-operator
 keywords:

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: