From 965c262aabb0ba2a657d67f4a9b1b8fef48ffa38 Mon Sep 17 00:00:00 2001 From: Random-Liu Date: Wed, 22 Mar 2017 15:17:11 -0700 Subject: [PATCH] Remove the master NoSchedule taint. --- cluster/gce/container-linux/configure-helper.sh | 1 - cluster/gce/gci/configure-helper.sh | 1 - cluster/saltbase/salt/kubelet/default | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cluster/gce/container-linux/configure-helper.sh b/cluster/gce/container-linux/configure-helper.sh index 10accb2c076..8cafc811a91 100755 --- a/cluster/gce/container-linux/configure-helper.sh +++ b/cluster/gce/container-linux/configure-helper.sh @@ -516,7 +516,6 @@ function start-kubelet { if [[ "${REGISTER_MASTER_KUBELET:-false}" == "true" ]]; then flags+=" --api-servers=https://${KUBELET_APISERVER}" flags+=" --register-schedulable=false" - flags+=" --register-with-taints=node.alpha.kubernetes.io/ismaster=:NoSchedule" else # Standalone mode (not widely used?) flags+=" --pod-cidr=${MASTER_IP_RANGE}" diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 6f2e80904c7..0d7aa0448eb 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -684,7 +684,6 @@ function start-kubelet { if [[ "${REGISTER_MASTER_KUBELET:-false}" == "true" ]]; then flags+=" --api-servers=https://${KUBELET_APISERVER}" flags+=" --register-schedulable=false" - flags+=" --register-with-taints=node.alpha.kubernetes.io/ismaster=:NoSchedule" else # Standalone mode (not widely used?) flags+=" --pod-cidr=${MASTER_IP_RANGE}" diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default index 02c4ba186e1..1df05d53410 100644 --- a/cluster/saltbase/salt/kubelet/default +++ b/cluster/saltbase/salt/kubelet/default @@ -33,7 +33,7 @@ # running on the master. {% if grains.kubelet_api_servers is defined -%} {% set api_servers_with_port = "--api-servers=https://" + grains.kubelet_api_servers -%} - {% set master_kubelet_args = master_kubelet_args + "--register-schedulable=false --register-with-taints=node.alpha.kubernetes.io/ismaster=:NoSchedule" -%} + {% set master_kubelet_args = master_kubelet_args + "--register-schedulable=false" -%} {% else -%} {% set api_servers_with_port = "" -%} {% endif -%}