Skip to content

Commit 6c9c631

Browse files
Merge pull request #208314 from rzhang628/aks-doc-rong
Aks doc rong
2 parents 62322e2 + 0f4ccc4 commit 6c9c631

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

articles/aks/certificate-rotation.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.date: 5/10/2022
1111
Azure Kubernetes Service (AKS) uses certificates for authentication with many of its components. If you have a RBAC-enabled cluster built after March 2022 it is enabled with certificate auto-rotation. Periodically, you may need to rotate those certificates for security or policy reasons. For example, you may have a policy to rotate all your certificates every 90 days.
1212

1313
> [!NOTE]
14-
> Certificate auto-rotation will not be enabled by default for non-RBAC enabled AKS clusters.
14+
> Certificate auto-rotation will *only* be enabled by default for RBAC enabled AKS clusters.
1515
1616
This article shows you how certificate rotation works in your AKS cluster.
1717

@@ -55,10 +55,11 @@ az vmss run-command invoke -g MC_rg_myAKSCluster_region -n vmss-name --instance-
5555

5656
## Certificate Auto Rotation
5757

58-
For AKS to automatically rotate non-CA certificates, the cluster must have [TLS Bootstrapping](https://kubernetes.io/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/) which has been enabled by default in all Azure regions.
58+
For AKS to automatically rotate non-CA certificates, the cluster must have [TLS Bootstrapping](https://kubernetes.io/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/) which has been enabled by default in all Azure regions.
5959

6060
> [!Note]
6161
> If you have an existing cluster you have to upgrade that cluster to enable Certificate Auto-Rotation.
62+
> Do not disable bootstrap to keep your auto-rotation enabled.
6263
6364
For any AKS clusters created or upgraded after March 2022 Azure Kubernetes Service will automatically rotate non-CA certificates on both the control plane and agent nodes within 80% of the client certificate valid time, before they expire with no downtime for the cluster.
6465

@@ -82,7 +83,7 @@ az aks upgrade -g $RESOURCE_GROUP_NAME -n $CLUSTER_NAME
8283

8384
### Limitation
8485

85-
Auto certificate rotation won't be enabled on a non-RBAC cluster.
86+
Certificate auto-rotation will only be enabled by default for RBAC enabled AKS clusters.
8687

8788
## Manually rotate your cluster certificates
8889

articles/aks/scale-cluster.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.date: 06/29/2022
88

99
# Scale the node count in an Azure Kubernetes Service (AKS) cluster
1010

11-
If the resource needs of your applications change, you can manually scale an AKS cluster to run a different number of nodes. When you scale down, nodes are carefully [cordoned and drained][kubernetes-drain] to minimize disruption to running applications. When you scale up, AKS waits until nodes are marked **Ready** by the Kubernetes cluster before pods are scheduled on them.
11+
If the resource needs of your applications change, your cluster performance may be impacted due to low capacity on CPU, memory, PID space, or disk sizes. To address these changes, you can manually scale your AKS cluster to run a different number of nodes. When you scale down, nodes are carefully [cordoned and drained][kubernetes-drain] to minimize disruption to running applications. When you scale up, AKS waits until nodes are marked **Ready** by the Kubernetes cluster before pods are scheduled on them.
1212

1313
## Scale the cluster nodes
1414

@@ -165,4 +165,4 @@ In this article, you manually scaled an AKS cluster to increase or decrease the
165165
[set-azakscluster]: /powershell/module/az.aks/set-azakscluster
166166
[cluster-autoscaler]: cluster-autoscaler.md
167167
[az-aks-nodepool-scale]: /cli/azure/aks/nodepool#az_aks_nodepool_scale
168-
[update-azaksnodepool]: /powershell/module/az.aks/update-azaksnodepool
168+
[update-azaksnodepool]: /powershell/module/az.aks/update-azaksnodepool

0 commit comments

Comments
 (0)