From 6b5f14921d0b6d844e46a745c4ee477ca8d72215 Mon Sep 17 00:00:00 2001
From: Yu-Ju Hong <yjhong@google.com>
Date: Tue, 27 Mar 2018 10:10:55 -0700
Subject: [PATCH] Remove references to the Debian-based Container-VM image

The image reached end-of-life in October 2017. Remove the associated
references from the cluster setup script.
---
 cluster/gce/config-default.sh  | 1 -
 cluster/gce/config-test.sh     | 1 -
 cluster/restore-from-backup.sh | 8 +-------
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh
index c7600253031..c7227c0a99b 100755
--- a/cluster/gce/config-default.sh
+++ b/cluster/gce/config-default.sh
@@ -73,7 +73,6 @@ fi
 # you are updating the os image versions, update this variable.
 # Also please update corresponding image for node e2e at:
 # https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml
-CVM_VERSION=${CVM_VERSION:-container-vm-v20170627}
 GCI_VERSION=${KUBE_GCI_VERSION:-cos-stable-65-10323-64-0}
 MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
 MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud}
diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh
index a29d9ee4328..d54253a59b3 100755
--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -75,7 +75,6 @@ ALLOWED_NOTREADY_NODES="${ALLOWED_NOTREADY_NODES:-$((NUM_NODES / 100))}"
 # you are updating the os image versions, update this variable.
 # Also please update corresponding image for node e2e at:
 # https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml
-CVM_VERSION=${CVM_VERSION:-container-vm-v20170627}
 GCI_VERSION=${KUBE_GCI_VERSION:-cos-stable-65-10323-64-0}
 MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
 MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud}
diff --git a/cluster/restore-from-backup.sh b/cluster/restore-from-backup.sh
index 5aab78f5081..c733fe295c7 100755
--- a/cluster/restore-from-backup.sh
+++ b/cluster/restore-from-backup.sh
@@ -203,13 +203,7 @@ fi
 # Also copy version.txt file.
 cp "${VERSION_FILE}" "${BACKUP_DIR}"
 
-# Find out if we are running GCI vs CVM.
-export CVM=$(curl "http://metadata/computeMetadata/v1/instance/attributes/" -H "Metadata-Flavor: Google" |& grep -q gci; echo $?)
-if [[ "$CVM" == "1" ]]; then
-  export MNT_DISK="/mnt/master-pd"
-else
-  export MNT_DISK="/mnt/disks/master-pd"
-fi
+export MNT_DISK="/mnt/disks/master-pd"
 
 # Save the corrupted data (clean directory if it is already non-empty).
 rm -rf "${MNT_DISK}/var/etcd-corrupted"