Skip to content

Commit a7e2960

Browse files
committedApr 12, 2022
Resolve image conflict
2 parents a73ac61 + 04b1710 commit a7e2960

File tree

146 files changed

+741
-416
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+741
-416
lines changed
 

‎articles/advisor/advisor-reference-reliability-recommendations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ Learn more about [Kubernetes - Azure Arc - Arc-enabled K8s agent version upgrade
280280

281281
Please be advised that your media account is about to hit its quota limits. Please review current usage of Assets, Content Key Policies and Stream Policies for the media account. To avoid any disruption of service, you should request quota limits to be increased for the entities that are closer to hitting quota limit. You can request quota limits to be increased by opening a ticket and adding relevant details to it. Please don't create additional Azure Media accounts in an attempt to obtain higher limits.
282282

283-
Learn more about [Media Service - AccountQuotaLimit (Increase Media Services quotas or limits to ensure continuity of service.)](/media-services/latest/limits-quotas-constraints-reference).
283+
Learn more about [Media Service - AccountQuotaLimit (Increase Media Services quotas or limits to ensure continuity of service.)](/azure/media-services/latest/limits-quotas-constraints-reference).
284284

285285
## Networking
286286

‎articles/aks/use-kms-etcd-encryption.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,6 @@ az provider register --namespace Microsoft.ContainerService
5959

6060
## Limitations
6161

62-
> [!WARNING]
63-
> Deleting the key or the Azure Key Vault is not supported and will cause your cluster to become unstable.
64-
>
65-
> If you need to recover your Key Vault or key, see the [Azure Key Vault recovery management with soft delete and purge protection](../key-vault/general/key-vault-recovery.md?tabs=azure-cli) documentation.
66-
6762
The following limitations apply when you integrate KMS etcd encryption with AKS:
6863

6964
* Disabling of the KMS etcd encryption feature.
@@ -78,6 +73,11 @@ The following limitations apply when you integrate KMS etcd encryption with AKS:
7873

7974
## Create a KeyVault and key
8075

76+
> [!WARNING]
77+
> Deleting the key or the Azure Key Vault is not supported and will cause your cluster to become unstable.
78+
>
79+
> If you need to recover your Key Vault or key, see the [Azure Key Vault recovery management with soft delete and purge protection](../key-vault/general/key-vault-recovery.md?tabs=azure-cli) documentation.
80+
8181
Use `az keyvault create` to create a KeyVault.
8282

8383
```azurecli
@@ -143,7 +143,7 @@ az aks create --name myAKSCluster --resource-group MyResourceGroup --assign-iden
143143

144144
## Update an exiting AKS cluster to enable KMS etcd encryption
145145

146-
Use `az aks update` with the `--enable-azure-keyvault-kms` and `--azure-keyvault-kms-key-id` parameters to enable KMS etcd encryption on an existing cluster.
146+
Use [az aks update][az-aks-update] with the `--enable-azure-keyvault-kms` and `--azure-keyvault-kms-key-id` parameters to enable KMS etcd encryption on an existing cluster.
147147

148148
```azurecli-interactive
149149
az aks update --name myAKSCluster --resource-group MyResourceGroup --enable-azure-keyvault-kms --azure-keyvault-kms-key-id $KEY_ID
@@ -152,5 +152,15 @@ az aks update --name myAKSCluster --resource-group MyResourceGroup --enable-azur
152152
<!-- LINKS - Internal -->
153153
[aks-support-policies]: support-policies.md
154154
[aks-faq]: faq.md
155+
[az-feature-register]: /cli/azure/feature#az-feature-register
156+
[az-feature-list]: /cli/azure/feature#az-feature-list
157+
[az extension add]: /cli/azure/extension#az-extension-add
158+
[az-extension-update]: /cli/azure/extension#az-extension-update
155159
[azure-cli-install]: /cli/azure/install-azure-cli
156160
[az-aks-create]: /cli/azure/aks#az-aks-create
161+
[az-extension-add]: /cli/azure/extension#az_extension_add
162+
[az-extension-update]: /cli/azure/extension#az_extension_update
163+
[az-feature-register]: /cli/azure/feature#az_feature_register
164+
[az-feature-list]: /cli/azure/feature#az_feature_list
165+
[az-provider-register]: /cli/azure/provider#az_provider_register
166+
[az-aks-update]: /cli/azure/aks#az_aks_update

0 commit comments

Comments
 (0)
Please sign in to comment.