mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
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.
This commit is contained in:
parent
f29c1301a3
commit
6b5f14921d
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user