chore: fix config.yaml template condition (#159)

Signed-off-by: Niccolò Fei <[email protected]>
EnterpriseDB · Jun 10, 2024 · 77ee732 · 77ee732
1 parent ec68241
commit 77ee732
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/charts/edb-postgres-distributed-for-kubernetes/templates/config.yaml b/charts/edb-postgres-distributed-for-kubernetes/templates/config.yaml
@@ -26,8 +26,7 @@ metadata:
   {{- end }}
 data:
   {{- toYaml .Values.config.data | nindent 2 }}
-{{- end }}
-{{- else -}}
+{{- else }}
 apiVersion: v1
 kind: Secret
 type: Opaque
@@ -42,3 +41,4 @@ metadata:
 stringData:
   {{- toYaml .Values.config.data | nindent 2 }}
 {{- end }}
+{{- end }}
diff --git a/charts/edb-postgres-for-kubernetes/templates/config.yaml b/charts/edb-postgres-for-kubernetes/templates/config.yaml
@@ -25,15 +25,14 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 data:
-  {{- if .Values.config.clusterWide  -}}
+  {{- if .Values.config.clusterWide -}}
   {{- toYaml .Values.config.data | nindent 2 }}
   {{- else -}}
   {{- $watchNamespaceMap := dict "WATCH_NAMESPACE" .Release.Namespace -}}
   {{- $fullConfiguration := merge .Values.config.data $watchNamespaceMap -}}
   {{- toYaml $fullConfiguration | nindent 2 }}
   {{- end -}}
-{{- end }}
-{{- else -}}
+{{- else }}
 apiVersion: v1
 kind: Secret
 type: Opaque
@@ -46,5 +45,12 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 stringData:
+  {{- if .Values.config.clusterWide -}}
   {{- toYaml .Values.config.data | nindent 2 }}
+  {{- else -}}
+  {{- $watchNamespaceMap := dict "WATCH_NAMESPACE" .Release.Namespace -}}
+  {{- $fullConfiguration := merge .Values.config.data $watchNamespaceMap -}}
+  {{- toYaml $fullConfiguration | nindent 2 }}
+  {{- end -}}
+{{- end }}
 {{- end }}