Merge branch 'v1.1' into patch-1

This commit is contained in:
Aaron Crawfis 2021-04-09 11:04:21 -07:00 committed by GitHub
commit 1555a1ce3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions

View File

@ -67,13 +67,13 @@ The above example uses secrets as plain strings. It is recommended to use a loca
3. Create the managed identity(Optional) 3. Create the managed identity(Optional)
This step is required only if the AKS Cluster is provisoned without the flag "--enable-managed-identity". If the cluster is provisioned with manahed identity, than is suggested to use the autogenerated managed identity that is associated to the Resource Group MC_*. This step is required only if the AKS Cluster is provisoned without the flag "--enable-managed-identity". If the cluster is provisioned with managed identity, than it is suggested to use the autogenerated managed identity that is associated to the Resource Group MC_*.
```bash ```bash
$identity = az identity create -g [your resource group] -n [you managed identity name] -o json | ConvertFrom-Json $identity = az identity create -g [your resource group] -n [your managed identity name] -o json | ConvertFrom-Json
``` ```
Below the command to retrieve the managed identity in the autogenerated scenario: Below is the command to retrieve the managed identity in the autogenerated scenario:
```bash ```bash
az aks show -g <AKSResourceGroup> -n <AKSClusterName> az aks show -g <AKSResourceGroup> -n <AKSClusterName>
@ -134,19 +134,19 @@ The above example uses secrets as plain strings. It is recommended to use a loca
apiVersion: "aadpodidentity.k8s.io/v1" apiVersion: "aadpodidentity.k8s.io/v1"
kind: AzureIdentity kind: AzureIdentity
metadata: metadata:
name: [you managed identity name] name: [your managed identity name]
spec: spec:
type: 0 type: 0
resourceID: [you managed identity id] resourceID: [your managed identity id]
clientID: [you managed identity Client ID] clientID: [your managed identity Client ID]
--- ---
apiVersion: "aadpodidentity.k8s.io/v1" apiVersion: "aadpodidentity.k8s.io/v1"
kind: AzureIdentityBinding kind: AzureIdentityBinding
metadata: metadata:
name: [you managed identity name]-identity-binding name: [your managed identity name]-identity-binding
spec: spec:
azureIdentity: [you managed identity name] azureIdentity: [your managed identity name]
selector: [you managed identity selector] selector: [your managed identity selector]
``` ```
10. Deploy the azure-identity-config.yaml: 10. Deploy the azure-identity-config.yaml:

View File

@ -88,7 +88,7 @@ The above example uses secrets as plain strings. It is recommended to use a loca
} }
``` ```
**Save the both the appId and tenant from the output which will be used in the next step** **Save both the appId and tenant from the output which will be used in the next step**
4. Get the Object Id for [your_service_principal_name] 4. Get the Object Id for [your_service_principal_name]