From 715e1fdbb71c358d2d14971ace3d6a2053fd43c7 Mon Sep 17 00:00:00 2001 From: Feruzjon Muyassarov Date: Mon, 26 Feb 2024 12:33:15 +0200 Subject: [PATCH] docs: update outdated/deprecated taints in the examples Refactor references to taints & tolerations, replacing master key with control-plane across all the example YAMLs. Signed-off-by: Feruzjon Muyassarov --- .../examples/cluster-autoscaler-run-on-control-plane.yaml | 4 ++-- .../azure/examples/cluster-autoscaler-autodiscover.yaml | 4 ++-- .../examples/cluster-autoscaler-standard-control-plane.yaml | 4 ++-- .../azure/examples/cluster-autoscaler-standard-msi.yaml | 4 ++-- .../examples/cluster-autoscaler-vmss-control-plane.yaml | 4 ++-- .../azure/examples/cluster-autoscaler-vmss-msi.yaml | 4 ++-- .../examples/cluster-autoscaler-deployment.yaml | 6 +++--- .../hetzner/examples/cluster-autoscaler-run-on-master.yaml | 6 +++--- .../cluster-autoscaler-deployment-control-plane.yaml | 4 ++-- .../cloudprovider/magnum/examples/values-autodiscovery.yaml | 6 +++--- .../cloudprovider/magnum/examples/values-example.yaml | 6 +++--- cluster-autoscaler/cloudprovider/tencentcloud/README.md | 2 +- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-run-on-control-plane.yaml b/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-run-on-control-plane.yaml index 9cda4af03e5b..1bc986ce19d5 100644 --- a/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-run-on-control-plane.yaml +++ b/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-run-on-control-plane.yaml @@ -149,9 +149,9 @@ spec: - effect: NoSchedule operator: "Equal" value: "true" - key: node-role.kubernetes.io/master + key: node-role.kubernetes.io/control-plane nodeSelector: - kubernetes.io/role: master + kubernetes.io/role: control-plane containers: - image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.2 name: cluster-autoscaler diff --git a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-autodiscover.yaml b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-autodiscover.yaml index fee3dc20a305..d9652ad98043 100644 --- a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-autodiscover.yaml +++ b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-autodiscover.yaml @@ -154,9 +154,9 @@ spec: - effect: NoSchedule operator: "Equal" value: "true" - key: node-role.kubernetes.io/master + key: node-role.kubernetes.io/control-plane nodeSelector: - kubernetes.io/role: master + kubernetes.io/role: control-plane containers: - command: - ./cluster-autoscaler diff --git a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard-control-plane.yaml b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard-control-plane.yaml index b3d21d8d92a5..1a2bb5666082 100644 --- a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard-control-plane.yaml +++ b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard-control-plane.yaml @@ -156,9 +156,9 @@ spec: - effect: NoSchedule operator: "Equal" value: "true" - key: node-role.kubernetes.io/master + key: node-role.kubernetes.io/control-plane nodeSelector: - kubernetes.io/role: master + kubernetes.io/role: control-plane containers: - command: - ./cluster-autoscaler diff --git a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard-msi.yaml b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard-msi.yaml index 83d2bcccb7ac..3a3175972507 100644 --- a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard-msi.yaml +++ b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard-msi.yaml @@ -154,9 +154,9 @@ spec: - effect: NoSchedule operator: "Equal" value: "true" - key: node-role.kubernetes.io/master + key: node-role.kubernetes.io/control-plane nodeSelector: - kubernetes.io/role: master + kubernetes.io/role: control-plane containers: - command: - ./cluster-autoscaler diff --git a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss-control-plane.yaml b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss-control-plane.yaml index 9161887cb4db..1a1756b5b07e 100644 --- a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss-control-plane.yaml +++ b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss-control-plane.yaml @@ -155,9 +155,9 @@ spec: - effect: NoSchedule operator: "Equal" value: "true" - key: node-role.kubernetes.io/master + key: node-role.kubernetes.io/control-plane nodeSelector: - kubernetes.io/role: master + kubernetes.io/role: control-plane containers: - image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }} imagePullPolicy: Always diff --git a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss-msi.yaml b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss-msi.yaml index b28a8e3c4db0..aa113b32fdfd 100644 --- a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss-msi.yaml +++ b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss-msi.yaml @@ -153,9 +153,9 @@ spec: - effect: NoSchedule operator: "Equal" value: "true" - key: node-role.kubernetes.io/master + key: node-role.kubernetes.io/control-plane nodeSelector: - kubernetes.io/role: master + kubernetes.io/role: control-plane containers: - image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }} imagePullPolicy: Always diff --git a/cluster-autoscaler/cloudprovider/cherryservers/examples/cluster-autoscaler-deployment.yaml b/cluster-autoscaler/cloudprovider/cherryservers/examples/cluster-autoscaler-deployment.yaml index 183575b49c19..1cf37bc3e3f4 100644 --- a/cluster-autoscaler/cloudprovider/cherryservers/examples/cluster-autoscaler-deployment.yaml +++ b/cluster-autoscaler/cloudprovider/cherryservers/examples/cluster-autoscaler-deployment.yaml @@ -18,16 +18,16 @@ spec: spec: tolerations: - effect: NoSchedule - key: node-role.kubernetes.io/master + key: node-role.kubernetes.io/control-plane # Node affinity is used to force cluster-autoscaler to stick - # to the master node. This allows the cluster to reliably downscale + # to the macontrol-plane node. This allows the cluster to reliably downscale # to zero worker nodes when needed. affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: node-role.kubernetes.io/master + - key: node-role.kubernetes.io/control-plane operator: Exists serviceAccountName: cluster-autoscaler containers: diff --git a/cluster-autoscaler/cloudprovider/hetzner/examples/cluster-autoscaler-run-on-master.yaml b/cluster-autoscaler/cloudprovider/hetzner/examples/cluster-autoscaler-run-on-master.yaml index 496c3551d858..1dd9b9d2a8e5 100644 --- a/cluster-autoscaler/cloudprovider/hetzner/examples/cluster-autoscaler-run-on-master.yaml +++ b/cluster-autoscaler/cloudprovider/hetzner/examples/cluster-autoscaler-run-on-master.yaml @@ -140,16 +140,16 @@ spec: serviceAccountName: cluster-autoscaler tolerations: - effect: NoSchedule - key: node-role.kubernetes.io/master + key: node-role.kubernetes.io/control-plane # Node affinity is used to force cluster-autoscaler to stick - # to the master node. This allows the cluster to reliably downscale + # to the control-plane node. This allows the cluster to reliably downscale # to zero worker nodes when needed. affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: node-role.kubernetes.io/master + - key: node-role.kubernetes.io/control-plane operator: Exists containers: - image: registry.k8s.io/autoscaling/cluster-autoscaler:latest # or your custom image diff --git a/cluster-autoscaler/cloudprovider/magnum/examples/cluster-autoscaler-deployment-control-plane.yaml b/cluster-autoscaler/cloudprovider/magnum/examples/cluster-autoscaler-deployment-control-plane.yaml index df3c97a45710..d507a8237394 100644 --- a/cluster-autoscaler/cloudprovider/magnum/examples/cluster-autoscaler-deployment-control-plane.yaml +++ b/cluster-autoscaler/cloudprovider/magnum/examples/cluster-autoscaler-deployment-control-plane.yaml @@ -18,7 +18,7 @@ spec: app: cluster-autoscaler spec: nodeSelector: - node-role.kubernetes.io/master: "" + node-role.kubernetes.io/control-plane: "" securityContext: runAsUser: 1001 tolerations: @@ -26,7 +26,7 @@ spec: value: "True" effect: NoSchedule - key: dedicated - value: "master" + value: "control-plane" effect: NoSchedule serviceAccountName: cluster-autoscaler-account containers: diff --git a/cluster-autoscaler/cloudprovider/magnum/examples/values-autodiscovery.yaml b/cluster-autoscaler/cloudprovider/magnum/examples/values-autodiscovery.yaml index bd2729265e8e..543dcd08b6e0 100644 --- a/cluster-autoscaler/cloudprovider/magnum/examples/values-autodiscovery.yaml +++ b/cluster-autoscaler/cloudprovider/magnum/examples/values-autodiscovery.yaml @@ -11,16 +11,16 @@ image: tag: v1.23.0 nodeSelector: - node-role.kubernetes.io/master: "" + node-role.kubernetes.io/control-plane: "" tolerations: - key: CriticalAddonsOnly value: "True" effect: NoSchedule - key: dedicated - value: "master" + value: "control-plane" effect: NoSchedule -- key: node-role.kubernetes.io/master +- key: node-role.kubernetes.io/control-plane effect: NoSchedule cloudConfigPath: /etc/kubernetes/cloud-config diff --git a/cluster-autoscaler/cloudprovider/magnum/examples/values-example.yaml b/cluster-autoscaler/cloudprovider/magnum/examples/values-example.yaml index af1e08481c22..608100c8e55b 100644 --- a/cluster-autoscaler/cloudprovider/magnum/examples/values-example.yaml +++ b/cluster-autoscaler/cloudprovider/magnum/examples/values-example.yaml @@ -12,16 +12,16 @@ image: tag: v1.23.0 nodeSelector: - node-role.kubernetes.io/master: "" + node-role.kubernetes.io/control-plane: "" tolerations: - key: CriticalAddonsOnly value: "True" effect: NoSchedule - key: dedicated - value: "master" + value: "control-plane" effect: NoSchedule -- key: node-role.kubernetes.io/master +- key: node-role.kubernetes.io/control-plane effect: NoSchedule cloudConfigPath: "/etc/kubernetes/cloud-config" diff --git a/cluster-autoscaler/cloudprovider/tencentcloud/README.md b/cluster-autoscaler/cloudprovider/tencentcloud/README.md index 6ae685a6c41f..793eaef6cbe3 100644 --- a/cluster-autoscaler/cloudprovider/tencentcloud/README.md +++ b/cluster-autoscaler/cloudprovider/tencentcloud/README.md @@ -146,7 +146,7 @@ spec: serviceAccountName: kube-admin tolerations: - effect: NoSchedule - key: node-role.kubernetes.io/master + key: node-role.kubernetes.io/control-plane volumes: - hostPath: path: /etc/localtime