Skip to content

Commit 6a872ee

Browse files
authored
Merge pull request #102330 from shdeshpa07/OADP-6704-azure-not-supported
Add note about restic not supported with Azure STS
2 parents 5f22652 + 096ea33 commit 6a872ee

File tree

2 files changed

+31
-11
lines changed

2 files changed

+31
-11
lines changed

backup_and_restore/application_backup_and_restore/installing/installing-oadp-azure.adoc

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@ To install the OADP Operator in a restricted network environment, you must first
2020

2121

2222
include::modules/migration-configuring-azure.adoc[leveloffset=+1]
23+
2324
include::modules/oadp-about-backup-snapshot-locations-secrets.adoc[leveloffset=+1]
25+
2426
include::modules/oadp-auth-azure-methods.adoc[leveloffset=+1]
27+
2528
include::modules/oadp-auth-azure-secret-based.adoc[leveloffset=+1]
26-
include::modules/oadp-auth-azure-sts.adoc[leveloffset=+1]
2729

28-
You can configure the Data Protection Application by setting Velero resource allocations or enabling self-signed CA certificates.
30+
include::modules/oadp-auth-azure-sts.adoc[leveloffset=+1]
2931

3032
include::modules/oadp-setting-resource-limits-and-requests.adoc[leveloffset=+1]
3133

@@ -34,20 +36,31 @@ include::snippets/oadp-nodeselector-snippet.adoc[]
3436
For more details, see xref:../../../backup_and_restore/application_backup_and_restore/installing/installing-oadp-azure.adoc#oadp-configuring-node-agents_installing-oadp-azure[Configuring node agents and node labels].
3537

3638
include::modules/oadp-self-signed-certificate.adoc[leveloffset=+1]
39+
3740
include::modules/oadp-using-ca-certificates-with-velero-command.adoc[leveloffset=+1]
3841

39-
// include::modules/oadp-installing-dpa-1-2-and-earlier.adoc[leveloffset=+1]
4042
include::modules/oadp-installing-dpa-1-3.adoc[leveloffset=+1]
43+
4144
include::modules/oadp-configuring-client-burst-qps.adoc[leveloffset=+1]
45+
4246
include::modules/oadp-configuring-node-agents.adoc[leveloffset=+1]
47+
4348
include::modules/oadp-configuring-node-agent-load-affinity.adoc[leveloffset=+1]
49+
4450
include::modules/oadp-node-agent-load-affinity-guidelines.adoc[leveloffset=+1]
51+
4552
include::modules/oadp-configuring-node-agent-load-concurrency.adoc[leveloffset=+1]
53+
4654
include::modules/oadp-configuring-node-agent-non-root.adoc[leveloffset=+1]
55+
4756
include::modules/oadp-configuring-repository-maintenance.adoc[leveloffset=+1]
57+
4858
include::modules/oadp-configuring-velero-load-affinity.adoc[leveloffset=+1]
59+
4960
include::modules/oadp-configuring-imagepullpolicy.adoc[leveloffset=+1]
61+
5062
include::modules/oadp-enabling-csi-dpa.adoc[leveloffset=+2]
63+
5164
include::modules/oadp-about-disable-node-agent-dpa.adoc[leveloffset=+2]
5265

5366
[role="_additional-resources"]

modules/oadp-auth-azure-sts.adoc

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ You can use Microsoft Entra Workload ID to access Azure storage for {oadp-short}
1111

1212
To use the Azure Security Token Service (STS) configuration, you need the `credentialsMode` field set to `Manual` during cluster installation. This approach uses the Cloud Credential Operator (`ccoctl`) to set up the workload identity infrastructure, including the OpenID Connect (OIDC) provider, issuer configuration, and user-assigned managed identities.
1313

14+
[NOTE]
15+
====
16+
{oadp-short} with Azure STS configuration does not support `restic` File System Backups (FSB) and restores.
17+
====
1418

1519
.Prerequisites
1620

@@ -173,9 +177,9 @@ spec:
173177
backupLocations:
174178
- bucket:
175179
cloudStorageRef:
176-
name: <cloud_storage_cr> # <1>
180+
name: <cloud_storage_cr>
177181
config:
178-
storageAccount: <storage_account_name> # <2>
182+
storageAccount: <storage_account_name>
179183
useAAD: "true"
180184
credential:
181185
key: azurekey
@@ -195,18 +199,21 @@ spec:
195199
- name: default
196200
velero:
197201
config:
198-
resourceGroup: <resource_group> # <3>
199-
subscriptionId: <subscription_ID> # <4>
202+
resourceGroup: <resource_group>
203+
subscriptionId: <subscription_ID>
200204
credential:
201205
key: azurekey
202206
name: cloud-credentials-azure
203207
provider: azure
204208
EOF
205209
----
206-
<1> Specify the `CloudStorage` CR name.
207-
<2> Specify the Azure storage account name.
208-
<3> Specify the resource group.
209-
<4> Specify the subscription ID.
210+
+
211+
where:
212+
213+
<cloud_storage_cr>:: Specify the `CloudStorage` CR name.
214+
<storage_account_name>:: Specify the Azure storage account name.
215+
<resource_group>:: Specify the resource group.
216+
<subscription_ID>:: Specify the subscription ID.
210217

211218
.Verification
212219

0 commit comments

Comments
 (0)