From 7347bce3cb72d5197f5d6b7f442d82d40b3f690b Mon Sep 17 00:00:00 2001 From: Pieter <110168856+Pionerd@users.noreply.github.com> Date: Mon, 8 Apr 2024 23:14:57 +0200 Subject: [PATCH 1/2] bugfix(cluster): Propagate inheritFromAzureAD to the barman configuration (#251) Signed-off-by: Pieter <110168856+Pionerd@users.noreply.github.com> --- charts/cluster/templates/_barman_object_store.tpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/cluster/templates/_barman_object_store.tpl b/charts/cluster/templates/_barman_object_store.tpl index f002800e5..4269ad951 100644 --- a/charts/cluster/templates/_barman_object_store.tpl +++ b/charts/cluster/templates/_barman_object_store.tpl @@ -33,7 +33,9 @@ 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.connectionString }} connectionString: name: {{ .chartFullname }}-backup-azure{{ .secretSuffix }}-creds key: AZURE_CONNECTION_STRING From 5f75eb4985ed75560b92d50e338f59b3e997ec78 Mon Sep 17 00:00:00 2001 From: JesseBot Date: Wed, 10 Apr 2024 21:44:42 +0200 Subject: [PATCH 2/2] Update charts/cluster/README.md - fix Getting Started doc markdown link by escaping space (#253) Signed-off-by: JesseBot --- charts/cluster/README.md | 2 +- charts/cluster/README.md.gotmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/cluster/README.md b/charts/cluster/README.md index 745779e66..014a68cfc 100644 --- a/charts/cluster/README.md +++ b/charts/cluster/README.md @@ -51,7 +51,7 @@ helm upgrade --install cnpg \ cnpg/cluster ``` -A more detailed guide can be found here: [Getting Started](docs/Getting Started.md) +A more detailed guide can be found in the [Getting Started docs](<./docs/Getting Started.md>). Cluster Configuration --------------------- diff --git a/charts/cluster/README.md.gotmpl b/charts/cluster/README.md.gotmpl index 956e1431e..e1a4d2f05 100644 --- a/charts/cluster/README.md.gotmpl +++ b/charts/cluster/README.md.gotmpl @@ -58,7 +58,7 @@ helm upgrade --install cnpg \ cnpg/cluster ``` -A more detailed guide can be found here: [Getting Started](docs/Getting Started.md) +A more detailed guide can be found in the [Getting Started docs](<./docs/Getting Started.md>). Cluster Configuration