From dc57a69c4f20faa9e4786fb3b41a5df5b078f1a2 Mon Sep 17 00:00:00 2001 From: Koonwah Chen Date: Tue, 25 Sep 2018 14:03:33 -0700 Subject: [PATCH] update netd node selector label to cloud.google.com/gke-netd-ready --- cluster/gce/config-default.sh | 2 +- cluster/gce/config-test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 33da8531675..8c2ebaed49d 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -195,7 +195,7 @@ CUSTOM_TYPHA_DEPLOYMENT_YAML="${KUBE_CUSTOM_TYPHA_DEPLOYMENT_YAML:-}" # To avoid running netd on a node that is not configured appropriately, # label each Node so that the DaemonSet can run the Pods only on ready Nodes. if [[ ${ENABLE_NETD:-} == "true" ]]; then - NON_MASTER_NODE_LABELS="${NON_MASTER_NODE_LABELS:+${NON_MASTER_NODE_LABELS},}beta.kubernetes.io/kube-netd-ready=true" + NON_MASTER_NODE_LABELS="${NON_MASTER_NODE_LABELS:+${NON_MASTER_NODE_LABELS},}cloud.google.com/gke-netd-ready=true" fi # Enable metadata concealment by firewalling pod traffic to the metadata server diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index b607e4c25e8..32b264e57b6 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -227,7 +227,7 @@ CUSTOM_TYPHA_DEPLOYMENT_YAML="${KUBE_CUSTOM_TYPHA_DEPLOYMENT_YAML:-}" # To avoid running netd on a node that is not configured appropriately, # label each Node so that the DaemonSet can run the Pods only on ready Nodes. if [[ ${ENABLE_NETD:-} == "true" ]]; then - NON_MASTER_NODE_LABELS="${NON_MASTER_NODE_LABELS:+${NON_MASTER_NODE_LABELS},}beta.kubernetes.io/kube-netd-ready=true" + NON_MASTER_NODE_LABELS="${NON_MASTER_NODE_LABELS:+${NON_MASTER_NODE_LABELS},}cloud.google.com/gke-netd-ready=true" fi # To avoid running Calico on a node that is not configured appropriately,