@@ -440,8 +440,8 @@ data:
440
440
# #### Workload Identity
441
441
442
442
If you have [Workload Identity mutating webhook](https://azure.github.io/azure-workload-identity/docs/installation/managed-clusters.html)
443
- installed on your cluster. You would need to create an Azure Identity and
444
- give it access to Azure Blob Storage.
443
+ installed on your cluster. You need to create an Azure Identity and give it
444
+ access to Azure Blob Storage.
445
445
446
446
` ` ` shell
447
447
export IDENTITY_NAME="blob-access"
@@ -451,7 +451,7 @@ az role assignment create --role "Storage Blob Data Reader" \
451
451
--scope "/subscriptions/<SUBSCRIPTION-ID>/resourceGroups/<RESOURCE_GROUP>/providers/Microsoft.Storage/storageAccounts/<account-name>/blobServices/default/containers/<container-name>"
452
452
` ` `
453
453
454
- Establish federated identity between the identity and the source-controller
454
+ Establish a federated identity between the Identity and the source-controller
455
455
ServiceAccount.
456
456
457
457
` ` ` shell
@@ -500,7 +500,7 @@ patches:
500
500
azure.workload.identity/use: "true"
501
501
` ` `
502
502
503
- If you have set Workload Identity up correctly and labeled the source-controller
503
+ If you have set up Workload Identity correctly and labeled the source-controller
504
504
Pod and ServiceAccount, then you don't need to reference a Secret. For more information,
505
505
please see [documentation](https://azure.github.io/azure-workload-identity/docs/quick-start.html).
506
506
@@ -520,7 +520,7 @@ spec:
520
520
# #### Managed Identity with AAD Pod Identity
521
521
522
522
If you are using [aad pod identity](https://azure.github.io/aad-pod-identity/docs),
523
- you can create an identity that has access to Azure Storage.
523
+ You need to create an Azure Identity and give it access to Azure Blob Storage.
524
524
525
525
` ` ` sh
526
526
export IDENTITY_NAME="blob-access"
@@ -533,7 +533,7 @@ export IDENTITY_CLIENT_ID="$(az identity show -n ${IDENTITY_NAME} -g ${RESOURCE_
533
533
export IDENTITY_RESOURCE_ID="$(az identity show -n ${IDENTITY_NAME} -otsv --query id)"
534
534
` ` `
535
535
536
- Create an ` AzureIdentity` object that references the identity created above :
536
+ Create an AzureIdentity object that references the identity created above :
537
537
538
538
` ` ` yaml
539
539
---
@@ -548,7 +548,8 @@ spec:
548
548
type: 0 # user-managed identity
549
549
` ` `
550
550
551
- Create an `AzureIdentityBinding` object that binds pods with a specific selector with the `AzureIdentity` created :
551
+ Create an AzureIdentityBinding object that binds Pods with a specific selector
552
+ with the AzureIdentity created :
552
553
553
554
` ` ` yaml
554
555
apiVersion: "aadpodidentity.k8s.io/v1"
@@ -575,8 +576,8 @@ spec:
575
576
aadpodidbinding: ${IDENTITY_NAME} # match the AzureIdentity name
576
577
` ` `
577
578
578
- If you have set aad-pod-identity up correctly and labeled the source-controller
579
- pod , then you don't need to reference a secret .
579
+ If you have set up aad-pod-identity correctly and labeled the source-controller
580
+ Pod , then you don't need to reference a Secret .
580
581
581
582
` ` ` yaml
582
583
apiVersion: source.toolkit.fluxcd.io/v1beta2
@@ -618,13 +619,16 @@ data:
618
619
sasKey: <base64>
619
620
` ` `
620
621
621
- The sasKey only contains the SAS token e.g `?sv=2020-08-0&ss=bfqt&srt=co&sp=rwdlacupitfx&se=2022-05-26T21:55:35Z&st=2022-05...`.
622
- The leading question mark is optional.
623
- The query values from the `sasKey` data field in the Secrets gets merged with the ones in the `spec.endpoint` of the `Bucket`.
624
- If the same key is present in the both of them, the value in the `sasKey` takes precedence.
622
+ The `sasKey` only contains the SAS token e.g
623
+ ` ?sv=2020-08-0&ss=bfqt&srt=co&sp=rwdlacupitfx&se=2022-05-26T21:55:35Z&st=2022-05...` .
624
+ The leading question mark (`?`) is optional. The query values from the `sasKey`
625
+ data field in the Secrets gets merged with the ones in the `.spec.endpoint` of
626
+ the Bucket. If the same key is present in the both of them, the value in the
627
+ ` sasKey` takes precedence.
625
628
626
- **Note:** The SAS token has an expiry date and it must be updated before it expires to allow Flux to
627
- continue to access Azure Storage. It is allowed to use an account-level or container-level SAS token.
629
+ **Note:** The SAS token has an expiry date, and it must be updated before it
630
+ expires to allow Flux to continue to access Azure Storage. It is allowed to use
631
+ an account-level or container-level SAS token.
628
632
629
633
The minimum permissions for an account-level SAS token are :
630
634
@@ -839,7 +843,7 @@ spec:
839
843
840
844
# ## Triggering a reconcile
841
845
842
- To manually tell the source-controller to reconcile a Bucket outside of the
846
+ To manually tell the source-controller to reconcile a Bucket outside the
843
847
[specified interval window](#interval), a Bucket can be annotated with
844
848
`reconcile.fluxcd.io/requestedAt : <arbitrary value>`. Annotating the resource
845
849
queues the Bucket for reconciliation if the `<arbitrary-value>` differs from
0 commit comments