Bug Fix: Azure connectionString exclusion depending on configuration …

…method Signed-off-by: Itay Grudev <[email protected]>
cloudnative-pg · Oct 19, 2023 · 41ca15f · 41ca15f
1 parent 9320836
commit 41ca15f
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/charts/cluster/templates/_barman_object_store.tpl b/charts/cluster/templates/_barman_object_store.tpl
@@ -27,18 +27,24 @@
   destinationPath: "https://{{ required "You need to specify Azure storageAccount if destinationPath is not specified." .scope.azure.storageAccount }}.{{ .scope.azure.serviceName }}.core.windows.net/{{ .scope.azure.containerName }}{{ .scope.azure.path }}"
   {{- end }}
   azureCredentials:
+  {{- if .scope.azure.connectionString }}
     connectionString:
       name: {{ .chartFullname }}-backup-azure{{ .secretSuffix }}-creds
       key: AZURE_CONNECTION_STRING
+  {{- else }}
     storageAccount:
       name: {{ .chartFullname }}-backup-azure{{ .secretSuffix }}-creds
       key: AZURE_STORAGE_ACCOUNT
+    {{- if .scope.azure.storageKey }}
     storageKey:
       name: {{ .chartFullname }}-backup-azure{{ .secretSuffix }}-creds
       key: AZURE_STORAGE_KEY
+    {{- else }}
     storageSasToken:
       name: {{ .chartFullname }}-backup-azure{{ .secretSuffix }}-creds
       key: AZURE_STORAGE_SAS_TOKEN
+    {{- end }}
+  {{- end }}
 {{- else if eq .scope.provider "google" }}
   {{- if empty .scope.destinationPath }}
   destinationPath: "gs://{{ required "You need to specify Google storage bucket if destinationPath is not specified." .scope.google.bucket }}{{ .scope.google.path }}"