Merge pull request #369 from kv-dhyey-moliya/patch-1

K8SPG-644 - Fix tolerations iteration issue for pg-db cluster template
percona · Sep 30, 2024 · e80957f · e80957f
2 parents fa1ba9e + 2a88d80
commit e80957f
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/charts/pg-db/templates/cluster.yaml b/charts/pg-db/templates/cluster.yaml
@@ -221,10 +221,12 @@ spec:
 
       {{- if $instance.tolerations }}
       tolerations:
-      - effect: {{ $instance.tolerations.effect }}
-        key: {{ $instance.tolerations.key }}
-        operator: {{ $instance.tolerations.operator }}
-        value: {{ $instance.tolerations.value }}
+      {{- range $toleration :=  $instance.tolerations }}
+        - effect: {{ $toleration.effect }}
+          key: {{ $toleration.key }}
+          operator: {{ $toleration.operator }}
+          value: {{ $toleration.value }}
+      {{- end }}
       {{- end }}
 
       {{- if $instance.priorityClassName }}
@@ -353,10 +355,12 @@ spec:
       {{- end }}
       {{- if .Values.proxy.pgBouncer.tolerations }}
       tolerations:
-      - effect: {{ .Values.proxy.pgBouncer.tolerations.effect }}
-        key: {{ .Values.proxy.pgBouncer.tolerations.key }}
-        operator: {{ .Values.proxy.pgBouncer.tolerations.operator }}
-        value: {{ .Values.proxy.pgBouncer.tolerations.value }}
+      {{- range $toleration := .Values.proxy.pgBouncer.tolerations }}
+        - effect: {{ $toleration.effect }}
+          key: {{ $toleration.key }}
+          operator: {{ $toleration.operator }}
+          value: {{ $toleration.value }}
+      {{- end }}
       {{- end }}
       {{- if .Values.proxy.pgBouncer.securityContext }}
       securityContext: 
@@ -412,10 +416,12 @@ spec:
             memory: {{ .Values.backups.pgbackrest.jobs.resources.limits.memory }}
         {{- if .Values.backups.pgbackrest.jobs.tolerations }}
         tolerations:
-        - effect: {{ .Values.backups.pgbackrest.jobs.tolerations.effect }}
-          key: {{ .Values.backups.pgbackrest.jobs.tolerations.key }}
-          operator: {{ .Values.backups.pgbackrest.jobs.tolerations.operator }}
-          value: {{ .Values.backups.pgbackrest.jobs.tolerations.value }}
+        {{- range $toleration := .Values.backups.pgbackrest.jobs.tolerations }}
+          - effect: {{ $toleration.effect }}
+            key: {{ $toleration.key }}
+            operator: {{ $toleration.operator }}
+            value: {{ $toleration.value }}
+        {{- end }}
         {{- end }}
         {{- if .Values.backups.pgbackrest.jobs.securityContext }}
         securityContext: