From 0e5dffc1fcdbf1d417b6d8502cdb4f5159236cf9 Mon Sep 17 00:00:00 2001
From: Sergey Kanzhelev <skanzhelev@google.com>
Date: Thu, 17 Feb 2022 19:00:22 +0000
Subject: [PATCH] there is no need for gci-docker-version and
 gci-ensure-gke-docker - those are not used by COS or any of scripts

Change-Id: I317c95d8fd2f51598cfa3e710380552d8fc07d2d
---
 cluster/gce/gci/helper.sh        | 6 ------
 cluster/gce/gci/master-helper.sh | 4 ----
 cluster/gce/gci/node-helper.sh   | 2 --
 3 files changed, 12 deletions(-)

diff --git a/cluster/gce/gci/helper.sh b/cluster/gce/gci/helper.sh
index 11dfd7b859b..b2db1dd56db 100755
--- a/cluster/gce/gci/helper.sh
+++ b/cluster/gce/gci/helper.sh
@@ -23,10 +23,4 @@ function ensure-gci-metadata-files {
   if [[ ! -f "${KUBE_TEMP}/gci-update.txt" ]]; then
     echo -n "update_disabled" > "${KUBE_TEMP}/gci-update.txt"
   fi
-  if [[ ! -f "${KUBE_TEMP}/gci-ensure-gke-docker.txt" ]]; then
-    echo -n "true" > "${KUBE_TEMP}/gci-ensure-gke-docker.txt"
-  fi
-  if [[ ! -f "${KUBE_TEMP}/gci-docker-version.txt" ]]; then
-    echo -n "${GCI_DOCKER_VERSION:-}" > "${KUBE_TEMP}/gci-docker-version.txt"
-  fi
 }
diff --git a/cluster/gce/gci/master-helper.sh b/cluster/gce/gci/master-helper.sh
index 0d49e85fab1..de8608cf40c 100755
--- a/cluster/gce/gci/master-helper.sh
+++ b/cluster/gce/gci/master-helper.sh
@@ -86,8 +86,6 @@ function replicate-master-instance() {
   echo "${master_certs}" > "${KUBE_TEMP}/kube-master-certs.yaml"
   get-metadata "${existing_master_zone}" "${existing_master_name}" cluster-name > "${KUBE_TEMP}/cluster-name.txt"
   get-metadata "${existing_master_zone}" "${existing_master_name}" gci-update-strategy > "${KUBE_TEMP}/gci-update.txt"
-  get-metadata "${existing_master_zone}" "${existing_master_name}" gci-ensure-gke-docker > "${KUBE_TEMP}/gci-ensure-gke-docker.txt"
-  get-metadata "${existing_master_zone}" "${existing_master_name}" gci-docker-version > "${KUBE_TEMP}/gci-docker-version.txt"
   get-metadata "${existing_master_zone}" "${existing_master_name}" cluster-location > "${KUBE_TEMP}/cluster-location.txt"
 
   create-master-instance-internal "${REPLICA_NAME}"
@@ -158,8 +156,6 @@ function create-master-instance-internal() {
   metadata="${metadata},cluster-location=${KUBE_TEMP}/cluster-location.txt"
   metadata="${metadata},cluster-name=${KUBE_TEMP}/cluster-name.txt"
   metadata="${metadata},gci-update-strategy=${KUBE_TEMP}/gci-update.txt"
-  metadata="${metadata},gci-ensure-gke-docker=${KUBE_TEMP}/gci-ensure-gke-docker.txt"
-  metadata="${metadata},gci-docker-version=${KUBE_TEMP}/gci-docker-version.txt"
   metadata="${metadata},kube-master-certs=${KUBE_TEMP}/kube-master-certs.yaml"
   metadata="${metadata},cluster-location=${KUBE_TEMP}/cluster-location.txt"
   metadata="${metadata},kube-master-internal-route=${KUBE_ROOT}/cluster/gce/gci/kube-master-internal-route.sh"
diff --git a/cluster/gce/gci/node-helper.sh b/cluster/gce/gci/node-helper.sh
index d6ccd25ca91..c1669dbdac8 100755
--- a/cluster/gce/gci/node-helper.sh
+++ b/cluster/gce/gci/node-helper.sh
@@ -28,8 +28,6 @@ function get-node-instance-metadata-from-file {
   metadata+="cluster-location=${KUBE_TEMP}/cluster-location.txt,"
   metadata+="cluster-name=${KUBE_TEMP}/cluster-name.txt,"
   metadata+="gci-update-strategy=${KUBE_TEMP}/gci-update.txt,"
-  metadata+="gci-ensure-gke-docker=${KUBE_TEMP}/gci-ensure-gke-docker.txt,"
-  metadata+="gci-docker-version=${KUBE_TEMP}/gci-docker-version.txt,"
   metadata+="shutdown-script=${KUBE_ROOT}/cluster/gce/gci/shutdown.sh,"
   metadata+="${NODE_EXTRA_METADATA}"
   echo "${metadata}"