Merge branch 'main' into feature/bootstrap-pg_basebackup

cloudnative-pg · Apr 10, 2024 · d365e81 · d365e81
2 parents fa5be43 + 5f75eb4
commit d365e81
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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

diff --git 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