From 943b32a2895c26ac53ab30820d1569709608f1e8 Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <liggitt@google.com>
Date: Fri, 22 Feb 2019 11:36:08 -0500
Subject: [PATCH] Prepare switch from beta.kubernetes.io/kube-proxy-ds-ready to
 node.kubernetes.io/kube-proxy-ds-ready

---
 cluster/addons/kube-proxy/kube-proxy-ds.yaml | 1 +
 cluster/gce/util.sh                          | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cluster/addons/kube-proxy/kube-proxy-ds.yaml b/cluster/addons/kube-proxy/kube-proxy-ds.yaml
index e082ca4d16..fb28b02a4c 100644
--- a/cluster/addons/kube-proxy/kube-proxy-ds.yaml
+++ b/cluster/addons/kube-proxy/kube-proxy-ds.yaml
@@ -27,6 +27,7 @@ spec:
       priorityClassName: system-node-critical
       hostNetwork: true
       nodeSelector:
+        # TODO(liggitt): switch to node.kubernetes.io/kube-proxy-ds-ready in 1.16
         beta.kubernetes.io/kube-proxy-ds-ready: "true"
       tolerations:
       - operator: "Exists"
diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index 99ea09119f..3f5aeec7ba 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -590,7 +590,8 @@ function build-linux-node-labels {
   if [[ "${KUBE_PROXY_DAEMONSET:-}" == "true" && "${master}" != "true" ]]; then
     # Add kube-proxy daemonset label to node to avoid situation during cluster
     # upgrade/downgrade when there are two instances of kube-proxy running on a node.
-    node_labels="beta.kubernetes.io/kube-proxy-ds-ready=true"
+    # TODO(liggitt): drop beta.kubernetes.io/kube-proxy-ds-ready in 1.16
+    node_labels="node.kubernetes.io/kube-proxy-ds-ready=true,beta.kubernetes.io/kube-proxy-ds-ready=true"
   fi
   if [[ -n "${NODE_LABELS:-}" ]]; then
     node_labels="${node_labels:+${node_labels},}${NODE_LABELS}"