From 51beaa2aeb533c2232c97d9c7200e2f009aa6e73 Mon Sep 17 00:00:00 2001 From: Jake Hyde <33796120+jakefhyde@users.noreply.github.com> Date: Wed, 20 Mar 2024 15:38:34 -0400 Subject: [PATCH] Update node selector to control-plane for RKE2 clusters (#1188) --- .../migrate-to-out-of-tree-amazon.md | 2 +- .../set-up-cloud-providers/amazon.md | 12 ++++++------ .../migrate-to-out-of-tree-amazon.md | 2 +- .../set-up-cloud-providers/amazon.md | 12 ++++++------ .../migrate-to-out-of-tree-amazon.md | 2 +- .../set-up-cloud-providers/amazon.md | 12 ++++++------ 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/migrate-to-an-out-of-tree-cloud-provider/migrate-to-out-of-tree-amazon.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/migrate-to-an-out-of-tree-cloud-provider/migrate-to-out-of-tree-amazon.md index 267d9b1c1ba..f7e2356ec48 100644 --- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/migrate-to-an-out-of-tree-cloud-provider/migrate-to-out-of-tree-amazon.md +++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/migrate-to-an-out-of-tree-cloud-provider/migrate-to-out-of-tree-amazon.md @@ -52,7 +52,7 @@ spec: 2. Cordon control plane nodes so that AWS cloud controller pods run on nodes only after upgrading to the external cloud provider: ```shell -kubectl cordon -l "node-role.kubernetes.io/controlplane=true" +kubectl cordon -l "node-role.kubernetes.io/control-plane=true" ``` 3. To install the AWS cloud controller manager with leader migration enabled, follow Steps 1-3 for [deploying the cloud controller manager chart](../set-up-cloud-providers/amazon.md#using-the-out-of-tree-aws-cloud-provider). From Kubernetes 1.22 onwards, the kube-controller-manager will utilize a default configuration which will satisfy the controller-to-manager migration. Update container args of the `aws-cloud-controller-manager` under `spec.rkeConfig.additionalManifest` to enable leader migration: diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md index 47c6d950b2d..00857004174 100644 --- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md +++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md @@ -352,9 +352,9 @@ tolerations: value: 'true' - effect: NoSchedule value: 'true' - key: node-role.kubernetes.io/controlplane + key: node-role.kubernetes.io/control-plane nodeSelector: - node-role.kubernetes.io/controlplane: 'true' + node-role.kubernetes.io/control-plane: 'true' args: - --configure-cloud-routes=false - --use-service-account-credentials=true @@ -639,7 +639,7 @@ kubectl rollout status daemonset -n kube-system aws-cloud-controller-manager - get ``` -9. Rancher-provisioned RKE nodes are tainted `node-role.kubernetes.io/controlplane`. Update tolerations and the nodeSelector: +9. Rancher-provisioned RKE2 nodes are tainted `node-role.kubernetes.io/control-plane`. Update tolerations and the nodeSelector: ```yaml tolerations: @@ -648,13 +648,13 @@ tolerations: value: 'true' - effect: NoSchedule value: 'true' - key: node-role.kubernetes.io/controlplane + key: node-role.kubernetes.io/control-plane ``` ```yaml nodeSelector: - node-role.kubernetes.io/controlplane: 'true' + node-role.kubernetes.io/control-plane: 'true' ``` :::note @@ -663,7 +663,7 @@ There's currently a [known issue](https://github.com/rancher/dashboard/issues/92 ```yaml nodeSelector: - node-role.kubernetes.io/controlplane: 'true' + node-role.kubernetes.io/control-plane: 'true' ``` ::: diff --git a/versioned_docs/version-2.7/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/migrate-to-an-out-of-tree-cloud-provider/migrate-to-out-of-tree-amazon.md b/versioned_docs/version-2.7/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/migrate-to-an-out-of-tree-cloud-provider/migrate-to-out-of-tree-amazon.md index 4bae5b14832..e4dd1cb3931 100644 --- a/versioned_docs/version-2.7/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/migrate-to-an-out-of-tree-cloud-provider/migrate-to-out-of-tree-amazon.md +++ b/versioned_docs/version-2.7/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/migrate-to-an-out-of-tree-cloud-provider/migrate-to-out-of-tree-amazon.md @@ -56,7 +56,7 @@ spec: 2. Cordon control plane nodes so that AWS cloud controller pods run on nodes only after upgrading to the external cloud provider: ```shell -kubectl cordon -l "node-role.kubernetes.io/controlplane=true" +kubectl cordon -l "node-role.kubernetes.io/control-plane=true" ``` 3. To install the AWS cloud controller manager with leader migration enabled, follow Steps 1-3 for [deploying the cloud controller manager chart](../set-up-cloud-providers/amazon.md#using-the-out-of-tree-aws-cloud-provider). From Kubernetes 1.22 onwards, the kube-controller-manager will utilize a default configuration which will satisfy the controller-to-manager migration. Update container args of the `aws-cloud-controller-manager` under `spec.rkeConfig.additionalManifest` to enable leader migration: diff --git a/versioned_docs/version-2.7/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md b/versioned_docs/version-2.7/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md index 064eec4332b..3483b28f07d 100644 --- a/versioned_docs/version-2.7/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md +++ b/versioned_docs/version-2.7/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md @@ -352,9 +352,9 @@ tolerations: value: 'true' - effect: NoSchedule value: 'true' - key: node-role.kubernetes.io/controlplane + key: node-role.kubernetes.io/control-plane nodeSelector: - node-role.kubernetes.io/controlplane: 'true' + node-role.kubernetes.io/control-plane: 'true' args: - --configure-cloud-routes=false - --use-service-account-credentials=true @@ -639,7 +639,7 @@ kubectl rollout status daemonset -n kube-system aws-cloud-controller-manager - get ``` -9. Rancher-provisioned RKE nodes are tainted `node-role.kubernetes.io/controlplane`. Update tolerations and the nodeSelector: +9. Rancher-provisioned RKE2 nodes are tainted `node-role.kubernetes.io/control-plane`. Update tolerations and the nodeSelector: ```yaml tolerations: @@ -648,13 +648,13 @@ tolerations: value: 'true' - effect: NoSchedule value: 'true' - key: node-role.kubernetes.io/controlplane + key: node-role.kubernetes.io/control-plane ``` ```yaml nodeSelector: - node-role.kubernetes.io/controlplane: 'true' + node-role.kubernetes.io/control-plane: 'true' ``` :::note @@ -663,7 +663,7 @@ There's currently a [known issue](https://github.com/rancher/dashboard/issues/92 ```yaml nodeSelector: - node-role.kubernetes.io/controlplane: 'true' + node-role.kubernetes.io/control-plane: 'true' ``` ::: diff --git a/versioned_docs/version-2.8/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/migrate-to-an-out-of-tree-cloud-provider/migrate-to-out-of-tree-amazon.md b/versioned_docs/version-2.8/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/migrate-to-an-out-of-tree-cloud-provider/migrate-to-out-of-tree-amazon.md index 267d9b1c1ba..f7e2356ec48 100644 --- a/versioned_docs/version-2.8/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/migrate-to-an-out-of-tree-cloud-provider/migrate-to-out-of-tree-amazon.md +++ b/versioned_docs/version-2.8/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/migrate-to-an-out-of-tree-cloud-provider/migrate-to-out-of-tree-amazon.md @@ -52,7 +52,7 @@ spec: 2. Cordon control plane nodes so that AWS cloud controller pods run on nodes only after upgrading to the external cloud provider: ```shell -kubectl cordon -l "node-role.kubernetes.io/controlplane=true" +kubectl cordon -l "node-role.kubernetes.io/control-plane=true" ``` 3. To install the AWS cloud controller manager with leader migration enabled, follow Steps 1-3 for [deploying the cloud controller manager chart](../set-up-cloud-providers/amazon.md#using-the-out-of-tree-aws-cloud-provider). From Kubernetes 1.22 onwards, the kube-controller-manager will utilize a default configuration which will satisfy the controller-to-manager migration. Update container args of the `aws-cloud-controller-manager` under `spec.rkeConfig.additionalManifest` to enable leader migration: diff --git a/versioned_docs/version-2.8/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md b/versioned_docs/version-2.8/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md index 47c6d950b2d..00857004174 100644 --- a/versioned_docs/version-2.8/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md +++ b/versioned_docs/version-2.8/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md @@ -352,9 +352,9 @@ tolerations: value: 'true' - effect: NoSchedule value: 'true' - key: node-role.kubernetes.io/controlplane + key: node-role.kubernetes.io/control-plane nodeSelector: - node-role.kubernetes.io/controlplane: 'true' + node-role.kubernetes.io/control-plane: 'true' args: - --configure-cloud-routes=false - --use-service-account-credentials=true @@ -639,7 +639,7 @@ kubectl rollout status daemonset -n kube-system aws-cloud-controller-manager - get ``` -9. Rancher-provisioned RKE nodes are tainted `node-role.kubernetes.io/controlplane`. Update tolerations and the nodeSelector: +9. Rancher-provisioned RKE2 nodes are tainted `node-role.kubernetes.io/control-plane`. Update tolerations and the nodeSelector: ```yaml tolerations: @@ -648,13 +648,13 @@ tolerations: value: 'true' - effect: NoSchedule value: 'true' - key: node-role.kubernetes.io/controlplane + key: node-role.kubernetes.io/control-plane ``` ```yaml nodeSelector: - node-role.kubernetes.io/controlplane: 'true' + node-role.kubernetes.io/control-plane: 'true' ``` :::note @@ -663,7 +663,7 @@ There's currently a [known issue](https://github.com/rancher/dashboard/issues/92 ```yaml nodeSelector: - node-role.kubernetes.io/controlplane: 'true' + node-role.kubernetes.io/control-plane: 'true' ``` :::