Skip to content

Commit

Permalink
docs: various nits in Bucket spec
Browse files Browse the repository at this point in the history
Signed-off-by: Hidde Beydals <hidde@hhh.computer>
  • Loading branch information
hiddeco committed Mar 30, 2023
1 parent a7316b6 commit 0385bc5
Showing 1 changed file with 16 additions and 12 deletions.
28 changes: 16 additions & 12 deletions docs/spec/v1beta2/buckets.md
Original file line number Diff line number Diff line change
Expand Up @@ -440,8 +440,8 @@ data:
##### Workload Identity

If you have [Workload Identity mutating webhook](https://azure.github.io/azure-workload-identity/docs/installation/managed-clusters.html)
installed on your cluster. You would need to create an Azure Identity and
give it access to Azure Blob Storage.
installed on your cluster. You need to create an Azure Identity and give it
access to Azure Blob Storage.

```shell
export IDENTITY_NAME="blob-access"
Expand All @@ -451,7 +451,7 @@ az role assignment create --role "Storage Blob Data Reader" \
--scope "/subscriptions/<SUBSCRIPTION-ID>/resourceGroups/<RESOURCE_GROUP>/providers/Microsoft.Storage/storageAccounts/<account-name>/blobServices/default/containers/<container-name>"
```

Establish federated identity between the identity and the source-controller
Establish a federated identity between the Identity and the source-controller
ServiceAccount.

```shell
Expand Down Expand Up @@ -500,7 +500,7 @@ patches:
azure.workload.identity/use: "true"
```

If you have set Workload Identity up correctly and labeled the source-controller
If you have set up Workload Identity correctly and labeled the source-controller
Pod and ServiceAccount, then you don't need to reference a Secret. For more information,
please see [documentation](https://azure.github.io/azure-workload-identity/docs/quick-start.html).

Expand Down Expand Up @@ -548,7 +548,8 @@ spec:
type: 0 # user-managed identity
```

Create an `AzureIdentityBinding` object that binds pods with a specific selector with the `AzureIdentity` created:
Create an `AzureIdentityBinding` object that binds Pods with a specific selector
with the `AzureIdentity` created:

```yaml
apiVersion: "aadpodidentity.k8s.io/v1"
Expand All @@ -575,7 +576,7 @@ spec:
aadpodidbinding: ${IDENTITY_NAME} # match the AzureIdentity name
```

If you have set aad-pod-identity up correctly and labeled the source-controller
If you have set up aad-pod-identity correctly and labeled the source-controller
pod, then you don't need to reference a secret.

```yaml
Expand Down Expand Up @@ -618,13 +619,16 @@ data:
sasKey: <base64>
```

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...`.
The leading question mark is optional.
The query values from the `sasKey` data field in the Secrets gets merged with the ones in the `spec.endpoint` of the `Bucket`.
If the same key is present in the both of them, the value in the `sasKey` takes precedence.
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...`.
The leading question mark (`?`) is optional. The query values from the `sasKey`
data field in the Secrets gets merged with the ones in the `.spec.endpoint` of
the `Bucket`. If the same key is present in the both of them, the value in the
`sasKey` takes precedence.

**Note:** The SAS token has an expiry date and it must be updated before it expires to allow Flux to
continue to access Azure Storage. It is allowed to use an account-level or container-level SAS token.
**Note:** The SAS token has an expiry date, and it must be updated before it
expires to allow Flux to continue to access Azure Storage. It is allowed to use
an account-level or container-level SAS token.

The minimum permissions for an account-level SAS token are:

Expand Down

0 comments on commit 0385bc5

Please sign in to comment.