From e420e0fca857ccbdf1386561a0d71c00ef993cfc Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@google.com>
Date: Fri, 19 Jan 2018 21:24:51 -0800
Subject: [PATCH] cluster: remove unused kubelet token

---
 cluster/common.sh      | 2 --
 cluster/gce/upgrade.sh | 3 ---
 cluster/gce/util.sh    | 1 -
 3 files changed, 6 deletions(-)

diff --git a/cluster/common.sh b/cluster/common.sh
index fb65bda2d59..d74b8e4d2ca 100755
--- a/cluster/common.sh
+++ b/cluster/common.sh
@@ -524,7 +524,6 @@ CLUSTER_REGISTRY_DISK_SIZE: $(yaml-quote ${CLUSTER_REGISTRY_DISK_SIZE:-})
 DNS_SERVER_IP: $(yaml-quote ${DNS_SERVER_IP:-})
 DNS_DOMAIN: $(yaml-quote ${DNS_DOMAIN:-})
 ENABLE_DNS_HORIZONTAL_AUTOSCALER: $(yaml-quote ${ENABLE_DNS_HORIZONTAL_AUTOSCALER:-false})
-KUBELET_TOKEN: $(yaml-quote ${KUBELET_TOKEN:-})
 KUBE_PROXY_DAEMONSET: $(yaml-quote ${KUBE_PROXY_DAEMONSET:-false})
 KUBE_PROXY_TOKEN: $(yaml-quote ${KUBE_PROXY_TOKEN:-})
 NODE_PROBLEM_DETECTOR_TOKEN: $(yaml-quote ${NODE_PROBLEM_DETECTOR_TOKEN:-})
@@ -1232,7 +1231,6 @@ function get-env-val() {
 function parse-master-env() {
   # Get required master env vars
   local master_env=$(get-master-env)
-  KUBELET_TOKEN=$(get-env-val "${master_env}" "KUBELET_TOKEN")
   KUBE_PROXY_TOKEN=$(get-env-val "${master_env}" "KUBE_PROXY_TOKEN")
   NODE_PROBLEM_DETECTOR_TOKEN=$(get-env-val "${master_env}" "NODE_PROBLEM_DETECTOR_TOKEN")
   CA_CERT_BASE64=$(get-env-val "${master_env}" "CA_CERT")
diff --git a/cluster/gce/upgrade.sh b/cluster/gce/upgrade.sh
index 82ea8f9cb4b..903604ffcf6 100755
--- a/cluster/gce/upgrade.sh
+++ b/cluster/gce/upgrade.sh
@@ -190,7 +190,6 @@ function get-node-os() {
 #   ZONE
 #
 # Vars set:
-#   KUBELET_TOKEN
 #   KUBE_PROXY_TOKEN
 #   NODE_PROBLEM_DETECTOR_TOKEN
 #   CA_CERT_BASE64
@@ -230,7 +229,6 @@ function setup-base-image() {
 # Vars set:
 #   SANITIZED_VERSION
 #   INSTANCE_GROUPS
-#   KUBELET_TOKEN
 #   KUBE_PROXY_TOKEN
 #   NODE_PROBLEM_DETECTOR_TOKEN
 #   CA_CERT_BASE64
@@ -253,7 +251,6 @@ function prepare-node-upgrade() {
 
   # Get required node env vars from exiting template.
   local node_env=$(get-node-env)
-  KUBELET_TOKEN=$(get-env-val "${node_env}" "KUBELET_TOKEN")
   KUBE_PROXY_TOKEN=$(get-env-val "${node_env}" "KUBE_PROXY_TOKEN")
   NODE_PROBLEM_DETECTOR_TOKEN=$(get-env-val "${node_env}" "NODE_PROBLEM_DETECTOR_TOKEN")
   CA_CERT_BASE64=$(get-env-val "${node_env}" "CA_CERT")
diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index cb4c5d28917..aba04a7246b 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -1037,7 +1037,6 @@ function create-master() {
   # from the other cluster variables so that the client (this
   # computer) can forget it later. This should disappear with
   # http://issue.k8s.io/3168
-  KUBELET_TOKEN=$(dd if=/dev/urandom bs=128 count=1 2>/dev/null | base64 | tr -d "=+/" | dd bs=32 count=1 2>/dev/null)
   KUBE_PROXY_TOKEN=$(dd if=/dev/urandom bs=128 count=1 2>/dev/null | base64 | tr -d "=+/" | dd bs=32 count=1 2>/dev/null)
   if [[ "${ENABLE_NODE_PROBLEM_DETECTOR:-}" == "standalone" ]]; then
     NODE_PROBLEM_DETECTOR_TOKEN=$(dd if=/dev/urandom bs=128 count=1 2>/dev/null | base64 | tr -d "=+/" | dd bs=32 count=1 2>/dev/null)