Skip to content

Commit

Permalink
fix nits
Browse files Browse the repository at this point in the history
Signed-off-by: Somtochi Onyekwere <somtochionyekwere@gmail.com>
  • Loading branch information
somtochiama committed Jul 19, 2023
1 parent 9709e52 commit 19cbf8a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
8 changes: 4 additions & 4 deletions docs/spec/v1beta2/buckets.md
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ data:
##### Workload Identity

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

```shell
Expand Down Expand Up @@ -501,7 +501,7 @@ patches:
```

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,
Deployment 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).

```yaml
Expand Down Expand Up @@ -561,7 +561,7 @@ spec:
selector: ${IDENTITY_NAME}
```

Label the source-controller correctly so that it can match an identity binding:
Label the source-controller Deployment correctly so that it can match an identity binding:

```yaml
apiVersion: apps/v1
Expand All @@ -577,7 +577,7 @@ spec:
```

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

```yaml
apiVersion: source.toolkit.fluxcd.io/v1beta2
Expand Down
2 changes: 1 addition & 1 deletion docs/spec/v1beta2/helmrepositories.md
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ patches:
azure.workload.identity/use: "true"
```

Ensure Workload Identity is properly setup on your cluster and the mutating webhook is installed.
Ensure Workload Identity is properly set up on your cluster and the mutating webhook is installed.
Create an identity that has access to ACR. Next, establish
a federated identity between the source-controller ServiceAccount and the
identity. Patch the source-controller Deployment and ServiceAccount as shown in the patch
Expand Down
6 changes: 2 additions & 4 deletions docs/spec/v1beta2/ocirepositories.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ by setting the `AZURE_CLIENT_ID` environment variable in the source-controller d
If you are running into further issues, please look at the
[troubleshooting guide](https://github.com/Azure/azure-sdk-for-go/blob/main/sdk/azidentity/TROUBLESHOOTING.md#azure-virtual-machine-managed-identity).


##### Workload Identity

When using Workload Identity to enable access to ACR, add the following patch to
Expand Down Expand Up @@ -210,7 +209,7 @@ patches:
azure.workload.identity/use: "true"
```

Ensure Workload Identity is properly setup on your cluster and the mutating webhook is installed.
Ensure Workload Identity is properly set up on your cluster and the mutating webhook is installed.
Create an identity that has access to ACR. Next, establish
a federated identity between the source-controller ServiceAccount and the
identity. Patch the source-controller Deployment and ServiceAccount as shown in the patch
Expand All @@ -221,7 +220,6 @@ above. Please take a look at this [guide](https://azure.github.io/azure-workload
**Note:** The AAD Pod Identity project will be archived in [September 2023](https://github.com/Azure/aad-pod-identity#-announcement),
and you are advised to use Workload Identity instead.


When using aad-pod-identity to enable access to ACR, add the following patch to
your bootstrap repository, in the `flux-system/kustomization.yaml` file:

Expand All @@ -246,7 +244,7 @@ has to be used to give the `source-controller` pod access to the ACR.
To do this, you have to install `aad-pod-identity` on your cluster, create a managed identity
that has access to the container registry (this can also be the Kubelet identity
if it has `AcrPull` role assignment on the ACR), create an `AzureIdentity` and `AzureIdentityBinding`
that describe the managed identity and then label the `source-controller` pods
that describe the managed identity and then label the `source-controller` deployment
with the name of the AzureIdentity as shown in the patch above. Please take a look
at [this guide](https://azure.github.io/aad-pod-identity/docs/) or
[this one](https://docs.microsoft.com/en-us/azure/aks/use-azure-ad-pod-identity)
Expand Down

0 comments on commit 19cbf8a

Please sign in to comment.