cluster: remove kube-push

cluster/gce/util.sh

@@ -2065,66 +2065,6 @@ function prepare-push() {
   fi
 }
 
-# Push binaries to kubernetes master
-function push-master() {
-  echo "Updating master metadata ..."
-  write-master-env
-  prepare-startup-script
-  add-instance-metadata-from-file "${KUBE_MASTER}" "kube-env=${KUBE_TEMP}/master-kube-env.yaml" "startup-script=${KUBE_TEMP}/configure-vm.sh"
-
-  echo "Pushing to master (log at ${OUTPUT}/push-${KUBE_MASTER}.log) ..."
-  cat ${KUBE_TEMP}/configure-vm.sh | gcloud compute ssh --ssh-flag="-o LogLevel=quiet" --project "${PROJECT}" --zone "${ZONE}" "${KUBE_MASTER}" --command "sudo bash -s -- --push" &> ${OUTPUT}/push-"${KUBE_MASTER}".log
-}
-
-# Push binaries to kubernetes node
-function push-node() {
-  node=${1}
-
-  echo "Updating node ${node} metadata... "
-  prepare-startup-script
-  add-instance-metadata-from-file "${node}" "kube-env=${KUBE_TEMP}/node-kube-env.yaml" "startup-script=${KUBE_TEMP}/configure-vm.sh"
-
-  echo "Start upgrading node ${node} (log at ${OUTPUT}/push-${node}.log) ..."
-  cat ${KUBE_TEMP}/configure-vm.sh | gcloud compute ssh --ssh-flag="-o LogLevel=quiet" --project "${PROJECT}" --zone "${ZONE}" "${node}" --command "sudo bash -s -- --push" &> ${OUTPUT}/push-"${node}".log
-}
-
-# Push binaries to kubernetes cluster
-function kube-push() {
-  # Disable this until it's fixed.
-  # See https://github.com/kubernetes/kubernetes/issues/17397
-  echo "./cluster/kube-push.sh is currently not supported in GCE."
-  echo "Please use ./cluster/gce/upgrade.sh."
-  exit 1
-
-  prepare-push true
-
-  push-master
-
-  for (( i=0; i<${#NODE_NAMES[@]}; i++)); do
-    push-node "${NODE_NAMES[$i]}" &
-  done
-
-  kube::util::wait-for-jobs || {
-    echo -e "${color_red}Some commands failed.${color_norm}" >&2
-  }
-
-  # TODO(zmerlynn): Re-create instance-template with the new
-  # node-kube-env. This isn't important until the node-ip-range issue
-  # is solved (because that's blocking automatic dynamic nodes from
-  # working). The node-kube-env has to be composed with the KUBELET_TOKEN
-  # and KUBE_PROXY_TOKEN.  Ideally we would have
-  # http://issue.k8s.io/3168
-  # implemented before then, though, so avoiding this mess until then.
-
-  echo
-  echo "Kubernetes cluster is running.  The master is running at:"
-  echo
-  echo "  https://${KUBE_MASTER_IP}"
-  echo
-  echo "The user name and password to use is located in ~/.kube/config"
-  echo
-}
-
 # -----------------------------------------------------------------------------
 # Cluster specific test helpers used from hack/e2e.go
 

cluster/kube-push.sh

-#!/bin/bash
-
-# Copyright 2014 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Push a new release to the cluster.
-#
-# This will find the release tar, cause it to be downloaded, unpacked, installed
-# and enacted.
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-echo "kube-push.sh is currently broken; see https://github.com/kubernetes/kubernetes/issues/17397"
-exit 1
-
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
-
-if [ -f "${KUBE_ROOT}/cluster/env.sh" ]; then
-    source "${KUBE_ROOT}/cluster/env.sh"
-fi
-
-source "${KUBE_ROOT}/cluster/kube-util.sh"
-
-function usage() {
-  echo "${0} [-m|-n <node id>] <version>"
-  echo "  Updates Kubernetes binaries. Can be done for all components (by default), master(-m) or specified node(-n)."
-  echo "  If the version is not specified will try to use local binaries."
-  echo "  Warning: upgrading single node is experimental"
-}
-
-push_to_master=false
-push_to_node=false
-
-while getopts "mn:h" opt; do
-  case ${opt} in
-    m)
-      push_to_master=true;;
-    n)
-      push_to_node=true
-      node_id="$OPTARG";;
-    h)
-      usage
-      exit 0;;
-    \?)
-      echo "Invalid option: -$OPTARG" >&2
-      usage
-      exit 1;;
-  esac
-done
-shift $((OPTIND-1))
-
-if [[ "${push_to_master}" == "true" ]] && [[ "${push_to_node}" == "true" ]]; then
-  echo "Only one of options -m -n should be specified"
-  usage
-  exit 1
-fi
-
-verify-prereqs
-verify-kube-binaries
-KUBE_VERSION=${1-}
-
-if [[ "${push_to_master}" == "false" ]] && [[ "${push_to_node}" == "false" ]]; then
-  echo "Updating cluster using provider: $KUBERNETES_PROVIDER"
-  kube-push
-fi
-
-if [[ "${push_to_master}" == "true" ]]; then
-  echo "Updating master to version ${KUBE_VERSION:-"dev"}"
-  prepare-push false
-  push-master
-fi
-
-if [[ "${push_to_node}" == "true" ]]; then
-  echo "Updating node $node_id to version ${KUBE_VERSION:-"dev"}"
-  prepare-push true
-  push-node $node_id
-fi
-
-echo "Validating cluster post-push..."
-
-"${KUBE_ROOT}/cluster/validate-cluster.sh"
-
-echo "Done"

cluster/skeleton/util.sh

@@ -55,11 +55,6 @@ function kube-down {
 	echo "Skeleton Provider: kube-down not implemented" 1>&2
 }
 
-# Update a kubernetes cluster
-function kube-push {
-	echo "Skeleton Provider: kube-push not implemented" 1>&2
-}
-
 # Prepare update a kubernetes component
 function prepare-push {
 	echo "Skeleton Provider: prepare-push not implemented" 1>&2