fix indentation

charts/postgres-cluster/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: postgres-cluster
-version: 2.1.0
+version: 2.2.0
 description: Chart for cloudnative-pg cluster
 keywords:
   - database

charts/postgres-cluster/templates/_helpers.tpl

@@ -5,8 +5,7 @@ Expand the name of the chart.
   {{- if .Values.nameOverride }}
     {{- .Values.nameOverride | trunc 63 | trimSuffix "-" }}
   {{- else }}
-    {{ $version := split "." .Values.cluster.image.tag }}
-    {{- printf "postgresql-%s-%s" $version._0 .Release.Name | trunc 63 | trimSuffix "-" -}}
+    {{- printf "postgresql-%s-%s" .Values.cluster.image.majorVersion .Release.Name | trunc 63 | trimSuffix "-" -}}
   {{- end }}
 {{- end }}
 

charts/postgres-cluster/values.yaml

@@ -24,6 +24,7 @@ cluster:
   image:
     repository: ghcr.io/cloudnative-pg/postgresql
     tag: "16.2"
+    majorVersion: "16"
     pullPolicy: IfNotPresent
 
   # The UID and GID of the postgres user inside the image

charts/taiga/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: taiga
-version: 0.1.1
+version: 0.1.3
 description: Chart for Taiga
 keywords:
   - kanban

charts/taiga/templates/deployment-events.yaml

@@ -48,49 +48,49 @@ spec:
         {{ toYaml . | nindent 8 }}
         {{- end }}
         containers:
-        - name: {{ template "taiga.fullname" . }}-events
-          image: "{{ .Values.events.image.repository }}:{{ .Values.events.image.tag }}"
-          imagePullPolicy: {{ .Values.events.image.pullPolicy }}
-          resources:
-            {{ toYaml .Values.events.resources | nindent 12 }}
-          ports:
-            - name: taiga-events
-              containerPort: {{ .Values.events.service.port }}
-              protocol: TCP
-          env:
-            - name: TAIGA_SECRET_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: "{{ .Values.secretKey.existingSecretName }}"
-                  key: "{{ .Values.secretKey.existingSecretKey }}"
-            - name: RABBITMQ_USER
-              value: "{{ index .Values "taiga-events-rabbitmq" "auth" "username" }}"
-            - name: RABBITMQ_PASS
-              valueFrom:
-                secretKeyRef:
-                  name: {{ index .Values "taiga-events-rabbitmq" "auth" "existingPasswordSecret" }}
-                  key: {{ index .Values "taiga-events-rabbitmq" "auth" "existingSecretPasswordKey" }}
+          - name: {{ template "taiga.fullname" . }}-events
+            image: "{{ .Values.events.image.repository }}:{{ .Values.events.image.tag }}"
+            imagePullPolicy: {{ .Values.events.image.pullPolicy }}
+            resources:
+              {{ toYaml .Values.events.resources | nindent 12 }}
+            ports:
+              - name: taiga-events
+                containerPort: {{ .Values.events.service.port }}
+                protocol: TCP
+            env:
+              - name: TAIGA_SECRET_KEY
+                valueFrom:
+                  secretKeyRef:
+                    name: "{{ .Values.secretKey.existingSecretName }}"
+                    key: "{{ .Values.secretKey.existingSecretKey }}"
+              - name: RABBITMQ_USER
+                value: "{{ index .Values "taiga-events-rabbitmq" "auth" "username" }}"
+              - name: RABBITMQ_PASS
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ index .Values "taiga-events-rabbitmq" "auth" "existingPasswordSecret" }}
+                    key: {{ index .Values "taiga-events-rabbitmq" "auth" "existingSecretPasswordKey" }}
 
-          {{- if .Values.events.livenessProbe.enabled }}
-          livenessProbe:
-            httpGet:
-              path: /admin/login/
-              port: {{ .Values.events.service.port }}
-            initialDelaySeconds: {{ .Values.events.livenessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.events.livenessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.events.livenessProbe.timeoutSeconds }}
-            successThreshold: {{ .Values.events.livenessProbe.successThreshold }}
-            failureThreshold: {{ .Values.events.livenessProbe.failureThreshold }}
-          {{- end }}
+            {{- if .Values.events.livenessProbe.enabled }}
+            livenessProbe:
+              httpGet:
+                path: /admin/login/
+                port: {{ .Values.events.service.port }}
+              initialDelaySeconds: {{ .Values.events.livenessProbe.initialDelaySeconds }}
+              periodSeconds: {{ .Values.events.livenessProbe.periodSeconds }}
+              timeoutSeconds: {{ .Values.events.livenessProbe.timeoutSeconds }}
+              successThreshold: {{ .Values.events.livenessProbe.successThreshold }}
+              failureThreshold: {{ .Values.events.livenessProbe.failureThreshold }}
+            {{- end }}
 
-          {{- if .Values.events.readinessProbe.enabled }}
-          readinessProbe:
-            httpGet:
-              path: /admin/login/
-              port: {{ .Values.events.service.port }}
-            initialDelaySeconds: {{ .Values.events.readinessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.events.readinessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.events.readinessProbe.timeoutSeconds }}
-            successThreshold: {{ .Values.events.readinessProbe.successThreshold }}
-            failureThreshold: {{ .Values.events.readinessProbe.failureThreshold }}
-          {{- end }}
+            {{- if .Values.events.readinessProbe.enabled }}
+            readinessProbe:
+              httpGet:
+                path: /admin/login/
+                port: {{ .Values.events.service.port }}
+              initialDelaySeconds: {{ .Values.events.readinessProbe.initialDelaySeconds }}
+              periodSeconds: {{ .Values.events.readinessProbe.periodSeconds }}
+              timeoutSeconds: {{ .Values.events.readinessProbe.timeoutSeconds }}
+              successThreshold: {{ .Values.events.readinessProbe.successThreshold }}
+              failureThreshold: {{ .Values.events.readinessProbe.failureThreshold }}
+            {{- end }}

charts/taiga/values.yaml

@@ -402,14 +402,6 @@ events:
     ##
     pullPolicy: IfNotPresent
 
-  ## events-taiga rabbitmq credentials
-  ## Must match to events-rabbitmq.auth.username and events-rabbitmq.auth.password
-  ## I don't use events-rabbitmq values because this bug: https://github.com/helm/helm/issues/2192
-  rabbitmq:
-    auth:
-      username: taiga
-      password: taiga
-
   ## Pod Security Context
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
   ##