From a9afa2417f0472f8c2c6e13916bcdac5cec24781 Mon Sep 17 00:00:00 2001 From: Pieter <110168856+Pionerd@users.noreply.github.com> Date: Mon, 8 Apr 2024 22:48:22 +0200 Subject: [PATCH 1/3] Use inheritFromAzureAD in cluster chart Signed-off-by: Pieter <110168856+Pionerd@users.noreply.github.com> --- charts/cluster/templates/_barman_object_store.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/cluster/templates/_barman_object_store.tpl b/charts/cluster/templates/_barman_object_store.tpl index f002800e5..ca81ebd0c 100644 --- a/charts/cluster/templates/_barman_object_store.tpl +++ b/charts/cluster/templates/_barman_object_store.tpl @@ -34,6 +34,8 @@ {{- end }} azureCredentials: {{- if .scope.azure.connectionString }} + inheritFromAzureAD: true + {{- else if .scope.azure.inheritFromAzureAD }} connectionString: name: {{ .chartFullname }}-backup-azure{{ .secretSuffix }}-creds key: AZURE_CONNECTION_STRING From 733cb2f8d15617546ef0824f59a531c5d7563c08 Mon Sep 17 00:00:00 2001 From: Pieter <110168856+Pionerd@users.noreply.github.com> Date: Mon, 8 Apr 2024 22:49:23 +0200 Subject: [PATCH 2/3] Typo inheritFromAzureAD Signed-off-by: Pieter <110168856+Pionerd@users.noreply.github.com> --- charts/cluster/templates/_barman_object_store.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/cluster/templates/_barman_object_store.tpl b/charts/cluster/templates/_barman_object_store.tpl index ca81ebd0c..839c569ec 100644 --- a/charts/cluster/templates/_barman_object_store.tpl +++ b/charts/cluster/templates/_barman_object_store.tpl @@ -33,7 +33,7 @@ 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 }} + {{- if .scope.azure.inheritFromAzureAD }} inheritFromAzureAD: true {{- else if .scope.azure.inheritFromAzureAD }} connectionString: From 1ee59228580a186fd7e20eaf8f53c8e76222283c Mon Sep 17 00:00:00 2001 From: Pieter <110168856+Pionerd@users.noreply.github.com> Date: Mon, 8 Apr 2024 22:49:52 +0200 Subject: [PATCH 3/3] Final typo Signed-off-by: Pieter <110168856+Pionerd@users.noreply.github.com> --- charts/cluster/templates/_barman_object_store.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/cluster/templates/_barman_object_store.tpl b/charts/cluster/templates/_barman_object_store.tpl index 839c569ec..4269ad951 100644 --- a/charts/cluster/templates/_barman_object_store.tpl +++ b/charts/cluster/templates/_barman_object_store.tpl @@ -35,7 +35,7 @@ azureCredentials: {{- if .scope.azure.inheritFromAzureAD }} inheritFromAzureAD: true - {{- else if .scope.azure.inheritFromAzureAD }} + {{- else if .scope.azure.connectionString }} connectionString: name: {{ .chartFullname }}-backup-azure{{ .secretSuffix }}-creds key: AZURE_CONNECTION_STRING