diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 869ba139630..1d0e7829b57 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -1617,7 +1617,7 @@ function validate-node-local-ssds-ext(){ ssdopts="${1}" if [[ -z "${ssdopts[0]}" || -z "${ssdopts[1]}" || -z "${ssdopts[2]}" ]]; then - echo -e "${color_red}Local SSD: NODE_LOCAL_SSDS_EXT is malformed, found ${ssdopts[0]-_},${ssdopts[1]-_},${ssdopts[2]-_} ${color_norm}" >&2 + echo -e "${color_red}Local SSD: NODE_LOCAL_SSDS_EXT is malformed, found ${ssdopts[0]-_},${ssdopts[1]-_},${ssdopts[2]-_} ${color_norm}" >&2 exit 2 fi if [[ "${ssdopts[1]}" != "scsi" && "${ssdopts[1]}" != "nvme" ]]; then @@ -2964,75 +2964,6 @@ function check-resources() { return 0 } -# Prepare to push new binaries to kubernetes cluster -# $1 - whether prepare push to node -function prepare-push() { - local node="${1-}" - #TODO(dawnchen): figure out how to upgrade a Container Linux node - if [[ "${node}" == "true" && "${NODE_OS_DISTRIBUTION}" != "debian" ]]; then - echo "Updating nodes in a kubernetes cluster with ${NODE_OS_DISTRIBUTION} is not supported yet." >&2 - exit 1 - fi - if [[ "${node}" != "true" && "${MASTER_OS_DISTRIBUTION}" != "debian" ]]; then - echo "Updating the master in a kubernetes cluster with ${MASTER_OS_DISTRIBUTION} is not supported yet." >&2 - exit 1 - fi - - OUTPUT=${KUBE_ROOT}/_output/logs - mkdir -p ${OUTPUT} - - kube::util::ensure-temp-dir - detect-project - detect-master - detect-node-names - get-kubeconfig-basicauth - get-kubeconfig-bearertoken - - # Make sure we have the tar files staged on Google Storage - tars_from_version - - # Prepare node env vars and update MIG template - if [[ "${node}" == "true" ]]; then - write-node-env - - local scope_flags=$(get-scope-flags) - - # Ugly hack: Since it is not possible to delete instance-template that is currently - # being used, create a temp one, then delete the old one and recreate it once again. - local tmp_template_name="${NODE_INSTANCE_PREFIX}-template-tmp" - create-node-instance-template $tmp_template_name - - local template_name="${NODE_INSTANCE_PREFIX}-template" - for group in ${INSTANCE_GROUPS[@]:-}; do - gcloud compute instance-groups managed \ - set-instance-template "${group}" \ - --template "$tmp_template_name" \ - --zone "${ZONE}" \ - --project "${PROJECT}" || true; - done - - gcloud compute instance-templates delete \ - --project "${PROJECT}" \ - --quiet \ - "$template_name" || true - - create-node-instance-template "$template_name" - - for group in ${INSTANCE_GROUPS[@]:-}; do - gcloud compute instance-groups managed \ - set-instance-template "${group}" \ - --template "$template_name" \ - --zone "${ZONE}" \ - --project "${PROJECT}" || true; - done - - gcloud compute instance-templates delete \ - --project "${PROJECT}" \ - --quiet \ - "$tmp_template_name" || true - fi -} - # ----------------------------------------------------------------------------- # Cluster specific test helpers used from hack/e2e.go diff --git a/cluster/skeleton/util.sh b/cluster/skeleton/util.sh index 6b15ca7869e..1cd9800ab1d 100644 --- a/cluster/skeleton/util.sh +++ b/cluster/skeleton/util.sh @@ -55,21 +55,6 @@ function kube-down { echo "Skeleton Provider: kube-down not implemented" 1>&2 } -# Prepare update a kubernetes component -function prepare-push { - echo "Skeleton Provider: prepare-push not implemented" 1>&2 -} - -# Update a kubernetes master -function push-master { - echo "Skeleton Provider: push-master not implemented" 1>&2 -} - -# Update a kubernetes node -function push-node { - echo "Skeleton Provider: push-node not implemented" 1>&2 -} - # Execute prior to running tests to build a release if required for env function test-build-release { echo "Skeleton Provider: test-build-release not implemented" 1>&2