Merge pull request #58118 from roberthbailey/vagrant

build/lib/release.sh

@@ -516,7 +516,6 @@ EOF
   cp -R "${KUBE_ROOT}/docs" "${release_stage}/"
   cp "${KUBE_ROOT}/README.md" "${release_stage}/"
   cp "${KUBE_ROOT}/Godeps/LICENSES" "${release_stage}/"
-  cp "${KUBE_ROOT}/Vagrantfile" "${release_stage}/"
 
   echo "${KUBE_GIT_VERSION}" > "${release_stage}/version"
 

build/release-tars/BUILD

@@ -193,7 +193,6 @@ pkg_tar(
     files = [
         "//:Godeps/LICENSES",
         "//:README.md",
-        "//:Vagrantfile",
         "//:version",
         "//cluster:all-srcs",
         "//docs:all-srcs",

cluster/saltbase/README.md

@@ -4,11 +4,10 @@ This is the root of the SaltStack configuration for Kubernetes. A high
 level overview for the Kubernetes SaltStack configuration can be found [in the docs tree.](https://kubernetes.io/docs/admin/salt/)
 
 This SaltStack configuration currently applies to default
-configurations for Debian-on-GCE, Fedora-on-Vagrant, Ubuntu-on-AWS and
-Ubuntu-on-Azure. (That doesn't mean it can't be made to apply to an
-arbitrary configuration, but those are only the in-tree OS/IaaS
-combinations supported today.) As you peruse the configuration, these
-are shorthanded as `gce`, `vagrant`, `aws`, `azure-legacy` in `grains.cloud`;
+configurations for Debian-on-GCE. (That doesn't mean it can't
+be made to apply to an arbitrary configuration, but those are
+only the in-tree OS/IaaS combinations supported today.) As you
+peruse the configuration, this is shorthanded as `gce`,  in `grains.cloud`;
 the documentation in this tree uses this same shorthand for convenience.
 
 See more:

cluster/vagrant/OWNERS

-approvers:
-- derekwaynecarr
-reviewers:
-- ArtfulCoder
-- thockin
-- lavalamp
-- smarterclayton
-- derekwaynecarr
-- caesarxuchao
-- vishh
-- mikedanese
-- liggitt
-- nikhiljindal
-- erictune
-- dchen1107
-- zmerlynn
-- justinsb
-- roberthbailey
-- eparis
-- jlowdermilk
-- piosz
-- jsafrane
-- jbeda
-- madhusudancs
-- jayunit100
-- cjcullen
-- david-mcmahon
-- mfojtik
-- pweil-
-- dcbw
-- ivan4th
-- filbranden
-- dshulyak
-- k82cn
-- caseydavenport
-- johscheuer

cluster/vagrant/config-default.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.
-
-## Contains configuration values for interacting with the Vagrant cluster
-
-# Number of nodes in the cluster
-NUM_NODES=${NUM_NODES-"1"}
-export NUM_NODES
-
-# The IP of the master
-export MASTER_IP=${MASTER_IP-"10.245.1.2"}
-export KUBE_MASTER_IP=${MASTER_IP}
-
-export INSTANCE_PREFIX="kubernetes"
-export MASTER_NAME="${INSTANCE_PREFIX}-master"
-
-# Should the master serve as a node
-REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-false}
-
-# Map out the IPs, names and container subnets of each node
-export NODE_IP_BASE=${NODE_IP_BASE-"10.245.1."}
-NODE_CONTAINER_SUBNET_BASE="10.246"
-MASTER_CONTAINER_NETMASK="255.255.255.0"
-MASTER_CONTAINER_ADDR="${NODE_CONTAINER_SUBNET_BASE}.0.1"
-MASTER_CONTAINER_SUBNET="${NODE_CONTAINER_SUBNET_BASE}.0.1/24"
-CONTAINER_SUBNET="${NODE_CONTAINER_SUBNET_BASE}.0.0/16"
-for ((i=0; i < NUM_NODES; i++)) do
-  NODE_IPS[$i]="${NODE_IP_BASE}$((i+3))"
-  NODE_NAMES[$i]="${INSTANCE_PREFIX}-node-$((i+1))"
-  NODE_CONTAINER_SUBNETS[$i]="${NODE_CONTAINER_SUBNET_BASE}.$((i+1)).1/24"
-  NODE_CONTAINER_ADDRS[$i]="${NODE_CONTAINER_SUBNET_BASE}.$((i+1)).1"
-  NODE_CONTAINER_NETMASKS[$i]="255.255.255.0"
-  VAGRANT_NODE_NAMES[$i]="node-$((i+1))"
-done
-
-CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.246.0.0/16}"
-
-SERVICE_CLUSTER_IP_RANGE=10.247.0.0/16  # formerly PORTAL_NET
-
-# Since this isn't exposed on the network, default to a simple user/passwd
-MASTER_USER="${MASTER_USER:-vagrant}"
-MASTER_PASSWD="${MASTER_PASSWD:-vagrant}"
-
-# Admission Controllers to invoke prior to persisting objects in cluster
-# If we included ResourceQuota, we should keep it at the end of the list to prevent incrementing quota usage prematurely.
-ADMISSION_CONTROL=Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,PVCProtection,ResourceQuota
-
-# Optional: Enable node logging.
-ENABLE_NODE_LOGGING=false
-LOGGING_DESTINATION=elasticsearch
-
-# Optional: When set to true, Elasticsearch and Kibana will be setup as part of the cluster bring up.
-ENABLE_CLUSTER_LOGGING=false
-ELASTICSEARCH_LOGGING_REPLICAS=1
-
-# Optional: Cluster monitoring to setup as part of the cluster bring up:
-#   none     - No cluster monitoring setup
-#   influxdb - Heapster, InfluxDB, and Grafana
-#   google   - Heapster, Google Cloud Monitoring, and Google Cloud Logging
-ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-influxdb}"
-
-# Extra options to set on the Docker command line.  This is useful for setting
-# --insecure-registry for local registries, or globally configuring selinux options
-# TODO Enable selinux when Fedora 21 repositories get an updated docker package
-#   see https://bugzilla.redhat.com/show_bug.cgi?id=1216151
-#EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS:-} -b=cbr0 --selinux-enabled --insecure-registry 10.0.0.0/8"
-EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS:-} --insecure-registry 10.0.0.0/8 -s overlay"
-
-# Flag to tell the kubelet to enable CFS quota support
-ENABLE_CPU_CFS_QUOTA="${KUBE_ENABLE_CPU_CFS_QUOTA:-true}"
-
-# Optional: Install cluster DNS.
-ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-true}"
-DNS_SERVER_IP="10.247.0.10"
-DNS_DOMAIN="cluster.local"
-
-# Optional: Enable DNS horizontal autoscaler
-ENABLE_DNS_HORIZONTAL_AUTOSCALER="${KUBE_ENABLE_DNS_HORIZONTAL_AUTOSCALER:-false}"
-
-# Optional: Install Kubernetes UI
-ENABLE_CLUSTER_UI="${KUBE_ENABLE_CLUSTER_UI:-true}"
-
-# Optional: Enable setting flags for kube-apiserver to turn on behavior in active-dev
-RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
-
-# Determine extra certificate names for master
-octets=($(echo "$SERVICE_CLUSTER_IP_RANGE" | sed -e 's|/.*||' -e 's/\./ /g'))
-((octets[3]+=1))
-service_ip=$(echo "${octets[*]}" | sed 's/ /./g')
-MASTER_EXTRA_SANS="IP:${service_ip},DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.${DNS_DOMAIN},DNS:${MASTER_NAME}"
-
-NETWORK_PROVIDER="${NETWORK_PROVIDER:-none}" # opencontrail, kubenet, etc
-if [ "${NETWORK_PROVIDER}" == "kubenet" ]; then
-  CLUSTER_IP_RANGE="${CONTAINER_SUBNET}"
-fi
-
-# If enabled kube-controller-manager will be started with the --enable-hostpath-provisioner flag
-ENABLE_HOSTPATH_PROVISIONER="${ENABLE_HOSTPATH_PROVISIONER:-true}"
-
-# OpenContrail networking plugin specific settings
-OPENCONTRAIL_TAG="${OPENCONTRAIL_TAG:-R2.20}"
-OPENCONTRAIL_KUBERNETES_TAG="${OPENCONTRAIL_KUBERNETES_TAG:-master}"
-OPENCONTRAIL_PUBLIC_SUBNET="${OPENCONTRAIL_PUBLIC_SUBNET:-10.1.0.0/16}"
-
-# Optional: if set to true, kube-up will configure the cluster to run e2e tests.
-E2E_STORAGE_TEST_ENVIRONMENT=${KUBE_E2E_STORAGE_TEST_ENVIRONMENT:-false}
-
-# Default fallback NETWORK_IF_NAME, will be used in case when no 'VAGRANT-BEGIN' comments were defined in network-script
-export DEFAULT_NETWORK_IF_NAME="eth0"

cluster/vagrant/config-test.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.
-
-## Contains configuration values for interacting with the Vagrant cluster in test mode
-#Set NUM_NODES to minimum required for testing.
-NUM_NODES=2
-
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
-source "${KUBE_ROOT}/cluster/vagrant/config-default.sh"
-
-# Do not register the master kubelet during testing
-REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-false}
-
-# Optional: if set to true, kube-up will configure the cluster to run e2e tests.
-E2E_STORAGE_TEST_ENVIRONMENT=${KUBE_E2E_STORAGE_TEST_ENVIRONMENT:-false}
-

cluster/vagrant/pod-ip-test.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.
-
-echoOK() {
-    TC='\e['
-    RegB="${TC}0m"
-    if [ "$1" -eq "0" ]; then
-        Green="${TC}32m"
-        echo -e "[${Green}OK${RegB}]"
-    else
-        Red="${TC}31m"
-        echo -e "[${Red}FAIL${RegB}]"
-        echo "Check log file."
-        exit 1
-    fi
-}
-
-usage() {
-    echo "Usage options: [--logfile <path to file>]"
-}
-
-logfile=/dev/null
-while [[ $# > 0 ]]; do
-    key="$1"
-    shift
-    case $key in
-       -l|--logfile)
-         logfile="$1"
-         if [ "$logfile" == "" ]; then
-             usage
-             exit 1
-         fi
-         shift
-         ;;
-       *)
-         # unknown option
-         usage
-         exit 1
-         ;;
-       esac
-done
-
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
-cd "${KUBE_ROOT}"
-
-echo All verbose output will be redirected to $logfile, use --logfile option to change.
-
-printf "Start the cluster with 2 nodes .. "
-export NUM_NODES=2
-export KUBERNETES_PROVIDER=vagrant
-
-(cluster/kube-up.sh >>"$logfile" 2>&1) || true
-echoOK $?
-
-printf "Check if node-1 can reach kubernetes master .. "
-vagrant ssh node-1 -- ping -c 10 kubernetes-master >>"$logfile" 2>&1
-echoOK $?
-printf "Check if node-2 can reach kubernetes master .. "
-vagrant ssh node-2 -- ping -c 10 kubernetes-master >>"$logfile" 2>&1
-echoOK $?
-
-printf "Pull an image that runs a web server on node-1 .. "
-vagrant ssh node-1 -- 'sudo docker pull kubernetes/serve_hostname' >>"$logfile" 2>&1
-echoOK $?
-printf "Pull an image that runs a web server on node-2 .. "
-vagrant ssh node-2 -- 'sudo docker pull kubernetes/serve_hostname' >>"$logfile" 2>&1
-echoOK $?
-
-printf "Run the server on node-1 .. "
-vagrant ssh node-1 -- sudo docker run -d kubernetes/serve_hostname >>"$logfile" 2>&1
-echoOK $?
-printf "Run the server on node-2 .. "
-vagrant ssh node-2 -- sudo docker run -d kubernetes/serve_hostname >>"$logfile" 2>&1
-echoOK $?
-
-printf "Run ping from node-1 to docker bridges and to the containers on both nodes .. "
-vagrant ssh node-1 -- 'ping -c 20 10.246.0.1 && ping -c 20 10.246.1.1 && ping -c 20 10.246.0.2 && ping -c 20 10.246.1.2' >>"$logfile" 2>&1
-echoOK $?
-printf "Same pinch from node-2 .. "
-vagrant ssh node-2 -- 'ping -c 20 10.246.0.1 && ping -c 20 10.246.1.1 && ping -c 20 10.246.0.2 && ping -c 20 10.246.1.2' >>"$logfile" 2>&1
-echoOK $?
-
-printf "tcp check, curl to both the running webservers from node-1 .. "
-vagrant ssh node-1 -- 'curl -sS 10.246.0.2:9376  && curl -sS 10.246.1.2:9376' >>"$logfile" 2>&1
-echoOK $?
-printf "tcp check, curl to both the running webservers from node-2 .. "
-vagrant ssh node-2 -- 'curl -sS 10.246.0.2:9376  && curl -sS 10.246.1.2:9376' >>"$logfile" 2>&1
-echoOK $?
-
-printf "All good, destroy the cluster .. "
-vagrant destroy -f >>"$logfile" 2>&1
-echoOK $?

cluster/vagrant/provision-master.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.
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-# Set the host name explicitly
-# See: https://github.com/mitchellh/vagrant/issues/2430
-hostnamectl set-hostname ${MASTER_NAME}
-# Set the variable to empty value explicitly
-if_to_edit=""
-
-if [[ "$(grep 'VERSION_ID' /etc/os-release)" =~ ^VERSION_ID=23 ]]; then
-  # Disable network interface being managed by Network Manager (needed for Fedora 21+)
-  NETWORK_CONF_PATH=/etc/sysconfig/network-scripts/
-  if_to_edit=$( find ${NETWORK_CONF_PATH}ifcfg-* | xargs grep -l VAGRANT-BEGIN )
-  for if_conf in ${if_to_edit}; do
-    grep -q ^NM_CONTROLLED= ${if_conf} || echo 'NM_CONTROLLED=no' >> ${if_conf}
-    sed -i 's/#^NM_CONTROLLED=.*/NM_CONTROLLED=no/' ${if_conf}
-  done;
-  systemctl restart network
-fi
-
-# needed for vsphere support
-# handle the case when no 'VAGRANT-BEGIN' comment was defined in network-scripts
-# set the NETWORK_IF_NAME to have a default value in such case
-NETWORK_IF_NAME=`echo ${if_to_edit} | awk -F- '{ print $3 }'`
-if [[ -z "$NETWORK_IF_NAME" ]]; then
-  NETWORK_IF_NAME=${DEFAULT_NETWORK_IF_NAME}
-fi
-
-# Setup hosts file to support ping by hostname to each node in the cluster from apiserver
-for (( i=0; i<${#NODE_NAMES[@]}; i++)); do
-  node=${NODE_NAMES[$i]}
-  ip=${NODE_IPS[$i]}
-  if [ ! "$(cat /etc/hosts | grep $node)" ]; then
-    echo "Adding $node to hosts file"
-    echo "$ip $node" >> /etc/hosts
-  fi
-done
-echo "127.0.0.1 localhost" >> /etc/hosts # enables cmds like 'kubectl get pods' on master.
-echo "$MASTER_IP $MASTER_NAME" >> /etc/hosts
-
-enable-accounting
-prepare-package-manager
-
-# Configure the master network
-if [ "${NETWORK_PROVIDER}" != "kubenet" ]; then
-  provision-network-master
-fi
-
-write-salt-config kubernetes-master
-
-# Generate and distribute a shared secret (bearer token) to
-# apiserver and kubelet so that kubelet can authenticate to
-# apiserver to send events.
-known_tokens_file="/srv/salt-overlay/salt/kube-apiserver/known_tokens.csv"
-if [[ ! -f "${known_tokens_file}" ]]; then
-
-  mkdir -p /srv/salt-overlay/salt/kube-apiserver
-  known_tokens_file="/srv/salt-overlay/salt/kube-apiserver/known_tokens.csv"
-  (umask u=rw,go= ;
-   echo "$KUBELET_TOKEN,kubelet,kubelet" > $known_tokens_file;
-   echo "$KUBE_PROXY_TOKEN,kube_proxy,kube_proxy" >> $known_tokens_file;
-   echo "$KUBE_BEARER_TOKEN,admin,admin" >> $known_tokens_file)
-
-  mkdir -p /srv/salt-overlay/salt/kubelet
-  kubelet_auth_file="/srv/salt-overlay/salt/kubelet/kubernetes_auth"
-  (umask u=rw,go= ; echo "{\"BearerToken\": \"$KUBELET_TOKEN\", \"Insecure\": true }" > $kubelet_auth_file)
-
-  create-salt-kubelet-auth
-  create-salt-kubeproxy-auth
-  # Generate tokens for other "service accounts".  Append to known_tokens.
-  #
-  # NB: If this list ever changes, this script actually has to
-  # change to detect the existence of this file, kill any deleted
-  # old tokens and add any new tokens (to handle the upgrade case).
-  service_accounts=("system:scheduler" "system:controller_manager" "system:logging" "system:monitoring" "system:dns")
-  for account in "${service_accounts[@]}"; do
-    token=$(dd if=/dev/urandom bs=128 count=1 2>/dev/null | base64 | tr -d "=+/" | dd bs=32 count=1 2>/dev/null)
-    echo "${token},${account},${account}" >> "${known_tokens_file}"
-  done
-fi
-
-
-readonly BASIC_AUTH_FILE="/srv/salt-overlay/salt/kube-apiserver/basic_auth.csv"
-if [ ! -e "${BASIC_AUTH_FILE}" ]; then
-  mkdir -p /srv/salt-overlay/salt/kube-apiserver
-  (umask 077;
-    echo "${MASTER_PASSWD},${MASTER_USER},admin" > "${BASIC_AUTH_FILE}")
-fi
-
-# Enable Fedora Cockpit on host to support Kubernetes administration
-# Access it by going to <master-ip>:9090 and login as vagrant/vagrant
-if ! which /usr/libexec/cockpit-ws &>/dev/null; then
-
-  pushd /etc/yum.repos.d
-    curl -OL https://copr.fedorainfracloud.org/coprs/g/cockpit/cockpit-preview/repo/fedora-23/msuchy-cockpit-preview-fedora-23.repo
-    dnf install -y cockpit cockpit-kubernetes docker socat ethtool
-  popd
-
-  systemctl enable cockpit.socket
-  systemctl start cockpit.socket
-fi
-
-install-salt
-
-run-salt

cluster/vagrant/provision-network-master.sh

-#!/bin/bash
-
-# Copyright 2015 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.
-
-# provision-network-master configures flannel on the master
-function provision-network-master {
-
-  echo "Provisioning network on master"
-
-  FLANNEL_ETCD_URL="http://${MASTER_IP}:4379"
-
-  # Install etcd for flannel data
-  if ! which etcd >/dev/null 2>&1; then
-
-    dnf install -y etcd
-
-    # Modify etcd configuration for flannel data
-    cat <<EOF >/etc/etcd/etcd.conf
-ETCD_NAME=flannel
-ETCD_DATA_DIR="/var/lib/etcd/flannel.etcd"
-ETCD_LISTEN_PEER_URLS="http://${MASTER_IP}:4380"
-ETCD_LISTEN_CLIENT_URLS="http://${MASTER_IP}:4379"
-ETCD_INITIAL_ADVERTISE_PEER_URLS="http://${MASTER_IP}:4380"
-ETCD_INITIAL_CLUSTER="flannel=http://${MASTER_IP}:4380"
-ETCD_ADVERTISE_CLIENT_URLS="${FLANNEL_ETCD_URL}"
-EOF
-
-    # fix the etcd boot failure issue
-    sed -i '/^Restart/a RestartSec=10' /usr/lib/systemd/system/etcd.service
-    systemctl daemon-reload
-
-    # Enable and start etcd
-    systemctl enable etcd
-    systemctl start etcd
-
-  fi
-
-  # Install flannel for overlay
-  if ! which flanneld >/dev/null 2>&1; then
-
-    dnf install -y flannel
-
-    cat <<EOF >/etc/flannel-config.json
-{
-    "Network": "${CONTAINER_SUBNET}",
-    "SubnetLen": 24,
-    "Backend": {
-        "Type": "udp",
-        "Port": 8285
-     }
-}
-EOF
-
-    # Import default configuration into etcd for master setup
-    etcdctl -C ${FLANNEL_ETCD_URL} set /coreos.com/network/config < /etc/flannel-config.json
-
-    # Configure local daemon to speak to master
-    NETWORK_CONF_PATH=/etc/sysconfig/network-scripts/
-    if_to_edit=$( find ${NETWORK_CONF_PATH}ifcfg-* | xargs grep -l VAGRANT-BEGIN )
-    NETWORK_IF_NAME=`echo ${if_to_edit} | awk -F- '{ print $3 }'`
-    # needed for vsphere support
-    # handle the case when no 'VAGRANT-BEGIN' comment was defined in network-scripts
-    # set the NETWORK_IF_NAME to have a default value in such case
-    if [[ -z "$NETWORK_IF_NAME" ]]; then
-      NETWORK_IF_NAME=${DEFAULT_NETWORK_IF_NAME}
-    fi
-    cat <<EOF >/etc/sysconfig/flanneld
-FLANNEL_ETCD="${FLANNEL_ETCD_URL}"
-FLANNEL_ETCD_KEY="/coreos.com/network"
-FLANNEL_OPTIONS="-iface=${NETWORK_IF_NAME} --ip-masq"
-EOF
-
-    # Start flannel
-    systemctl enable flanneld
-    systemctl start flanneld
-  fi
-
-  echo "Network configuration verified"
-}

cluster/vagrant/provision-network-node.sh

-#!/bin/bash
-
-# Copyright 2015 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.
-
-# provision-network-node configures flannel on the node
-function provision-network-node {
-
-  echo "Provisioning network on node"
-
-  FLANNEL_ETCD_URL="http://${MASTER_IP}:4379"
-
-  # Install flannel for overlay
-  if ! which flanneld >/dev/null 2>&1; then
-
-    dnf install -y flannel
-
-    # Configure local daemon to speak to master
-    NETWORK_CONF_PATH=/etc/sysconfig/network-scripts/
-    if_to_edit=$( find ${NETWORK_CONF_PATH}ifcfg-* | xargs grep -l VAGRANT-BEGIN )
-    NETWORK_IF_NAME=`echo ${if_to_edit} | awk -F- '{ print $3 }'`
-    # needed for vsphere support
-    # handle the case when no 'VAGRANT-BEGIN' comment was defined in network-scripts
-    # set the NETWORK_IF_NAME to have a default value in such case
-    if [[ -z "$NETWORK_IF_NAME" ]]; then
-      NETWORK_IF_NAME=${DEFAULT_NETWORK_IF_NAME}
-    fi
-    cat <<EOF >/etc/sysconfig/flanneld
-FLANNEL_ETCD="${FLANNEL_ETCD_URL}"
-FLANNEL_ETCD_KEY="/coreos.com/network"
-FLANNEL_OPTIONS="-iface=${NETWORK_IF_NAME} --ip-masq"
-EOF
-
-    # Start flannel
-    systemctl enable flanneld
-    systemctl start flanneld
-  fi
-
-  echo "Network configuration verified"
-}

cluster/vagrant/provision-node.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.
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-# Set the host name explicitly
-# See: https://github.com/mitchellh/vagrant/issues/2430
-hostnamectl set-hostname ${NODE_NAME}
-if_to_edit=""
-
-if [[ "$(grep 'VERSION_ID' /etc/os-release)" =~ ^VERSION_ID=23 ]]; then
-  # Disable network interface being managed by Network Manager (needed for Fedora 21+)
-  NETWORK_CONF_PATH=/etc/sysconfig/network-scripts/
-  if_to_edit=$( find ${NETWORK_CONF_PATH}ifcfg-* | xargs grep -l VAGRANT-BEGIN )
-  for if_conf in ${if_to_edit}; do
-    grep -q ^NM_CONTROLLED= ${if_conf} || echo 'NM_CONTROLLED=no' >> ${if_conf}
-    sed -i 's/#^NM_CONTROLLED=.*/NM_CONTROLLED=no/' ${if_conf}
-  done;
-  systemctl restart network
-fi
-
-# needed for vsphere support
-# handle the case when no 'VAGRANT-BEGIN' comment was defined in network-scripts
-# set the NETWORK_IF_NAME to have a default value in such case
-NETWORK_IF_NAME=`echo ${if_to_edit} | awk -F- '{ print $3 }'`
-if [[ -z "$NETWORK_IF_NAME" ]]; then
-  NETWORK_IF_NAME=${DEFAULT_NETWORK_IF_NAME}
-fi
-
-# Setup hosts file to support ping by hostname to master
-if [ ! "$(cat /etc/hosts | grep $MASTER_NAME)" ]; then
-  echo "Adding $MASTER_NAME to hosts file"
-  echo "$MASTER_IP $MASTER_NAME" >> /etc/hosts
-fi
-echo "$NODE_IP $NODE_NAME" >> /etc/hosts
-
-# Setup hosts file to support ping by hostname to each node in the cluster
-for (( i=0; i<${#NODE_NAMES[@]}; i++)); do
-  node=${NODE_NAMES[$i]}
-  ip=${NODE_IPS[$i]}
-  if [ ! "$(cat /etc/hosts | grep $node)" ]; then
-    echo "Adding $node to hosts file"
-    echo "$ip $node" >> /etc/hosts
-  fi
-done
-
-enable-accounting
-prepare-package-manager
-
-# Configure network
-if [ "${NETWORK_PROVIDER}" != "kubenet" ]; then
-  provision-network-node
-fi
-
-write-salt-config kubernetes-pool
-
-# Generate kubelet and kube-proxy auth file(kubeconfig) if there is not an existing one
-known_kubeconfig_file="/srv/salt-overlay/salt/kubelet/kubeconfig"
-if [[ ! -f "${known_kubeconfig_file}" ]]; then
-  create-salt-kubelet-auth
-  create-salt-kubeproxy-auth
-else
-  # stop kubelet, let salt start it later
-  systemctl stop kubelet
-fi
-
-install-salt
-add-volume-support
-
-run-salt
-
-dnf install -y socat ethtool
-dnf update -y docker

cluster/vagrant/provision-utils.sh

-#!/bin/bash
-
-# Copyright 2015 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.
-
-function enable-accounting() {
-  mkdir -p /etc/systemd/system.conf.d/
-  cat <<EOF >/etc/systemd/system.conf.d/kubernetes-accounting.conf
-[Manager]
-DefaultCPUAccounting=yes
-DefaultMemoryAccounting=yes
-EOF
-  systemctl daemon-reload
-}
-
-function prepare-package-manager() {
-  echo "Prepare package manager"
-
-  # Useful if a mirror is broken or slow
-  if [ -z "$CUSTOM_FEDORA_REPOSITORY_URL" ]; then
-      echo "fastestmirror=True" >> /etc/dnf/dnf.conf
-  else
-      # remove trailing slash from URL if it's present
-      CUSTOM_FEDORA_REPOSITORY_URL="${CUSTOM_FEDORA_REPOSITORY_URL%/}"
-      sed -i -e "/^metalink=/d" /etc/yum.repos.d/*.repo
-      sed -i -e "s@^#baseurl=http://download.fedoraproject.org/pub/fedora@baseurl=$CUSTOM_FEDORA_REPOSITORY_URL@" /etc/yum.repos.d/*.repo
-  fi
-}
-
-
-function add-volume-support() {
-  echo "Adding nfs volume support"
-
-  # we need nfs-utils to support volumes
-  dnf install -y nfs-utils
-}
-
-function write-salt-config() {
-  local role="$1"
-
-  # Update salt configuration
-  mkdir -p /etc/salt/minion.d
-
-  mkdir -p /srv/salt-overlay/pillar
-  cat <<EOF >/srv/salt-overlay/pillar/cluster-params.sls
-service_cluster_ip_range: '$(echo "$SERVICE_CLUSTER_IP_RANGE" | sed -e "s/'/''/g")'
-cert_ip: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
-enable_cluster_monitoring: '$(echo "$ENABLE_CLUSTER_MONITORING" | sed -e "s/'/''/g")'
-enable_cluster_logging: '$(echo "$ENABLE_CLUSTER_LOGGING" | sed -e "s/'/''/g")'
-enable_cluster_ui: '$(echo "$ENABLE_CLUSTER_UI" | sed -e "s/'/''/g")'
-enable_node_logging: '$(echo "$ENABLE_NODE_LOGGING" | sed -e "s/'/''/g")'
-logging_destination: '$(echo "$LOGGING_DESTINATION" | sed -e "s/'/''/g")'
-elasticsearch_replicas: '$(echo "$ELASTICSEARCH_LOGGING_REPLICAS" | sed -e "s/'/''/g")'
-enable_cluster_dns: '$(echo "$ENABLE_CLUSTER_DNS" | sed -e "s/'/''/g")'
-dns_server: '$(echo "$DNS_SERVER_IP" | sed -e "s/'/''/g")'
-dns_domain: '$(echo "$DNS_DOMAIN" | sed -e "s/'/''/g")'
-instance_prefix: '$(echo "$INSTANCE_PREFIX" | sed -e "s/'/''/g")'
-admission_control: '$(echo "$ADMISSION_CONTROL" | sed -e "s/'/''/g")'
-enable_cpu_cfs_quota: '$(echo "$ENABLE_CPU_CFS_QUOTA" | sed -e "s/'/''/g")'
-network_provider: '$(echo "$NETWORK_PROVIDER" | sed -e "s/'/''/g")'
-cluster_cidr: '$(echo "$CLUSTER_IP_RANGE" | sed -e "s/'/''/g")'
-opencontrail_tag: '$(echo "$OPENCONTRAIL_TAG" | sed -e "s/'/''/g")'
-opencontrail_kubernetes_tag: '$(echo "$OPENCONTRAIL_KUBERNETES_TAG" | sed -e "s/'/''/g")'
-opencontrail_public_subnet: '$(echo "$OPENCONTRAIL_PUBLIC_SUBNET" | sed -e "s/'/''/g")'
-e2e_storage_test_environment: '$(echo "$E2E_STORAGE_TEST_ENVIRONMENT" | sed -e "s/'/''/g")'
-enable_hostpath_provisioner: '$(echo "$ENABLE_HOSTPATH_PROVISIONER" | sed -e "s/'/''/g")'
-EOF
-
-if [ -n "${EVICTION_HARD:-}" ]; then
-  cat <<EOF >>/srv/salt-overlay/pillar/cluster-params.sls
-eviction_hard: '$(echo "${EVICTION_HARD}" | sed -e "s/'/''/g")'
-EOF
-fi
-
-  cat <<EOF >/etc/salt/minion.d/log-level-debug.conf
-log_level: warning
-log_level_logfile: warning
-EOF
-
-  cat <<EOF >/etc/salt/minion.d/grains.conf
-grains:
-  node_ip: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
-  publicAddressOverride: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
-  network_mode: openvswitch
-  networkInterfaceName: '$(echo "$NETWORK_IF_NAME" | sed -e "s/'/''/g")'
-  api_servers: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
-  kubelet_kubeconfig: /srv/salt-overlay/salt/kubelet/kubeconfig
-  cloud: vagrant
-  roles:
-    - $role
-  runtime_config: '$(echo "$RUNTIME_CONFIG" | sed -e "s/'/''/g")'
-  docker_opts: '$(echo "$DOCKER_OPTS" | sed -e "s/'/''/g")'
-  master_extra_sans: '$(echo "$MASTER_EXTRA_SANS" | sed -e "s/'/''/g")'
-  keep_host_etcd: true
-  kube_user: '$(echo "$KUBE_USER" | sed -e "s/'/''/g")'
-EOF
-}
-
-function release_not_found() {
-  echo "It looks as if you don't have a compiled version of Kubernetes.  If you" >&2
-  echo "are running from a clone of the git repo, please run 'make quick-release'." >&2
-  echo "Note that this requires having Docker installed.  If you are running " >&2
-  echo "from a release tarball, something is wrong.  Look at " >&2
-  echo "http://kubernetes.io/ for information on how to contact the development team for help." >&2
-  exit 1
-}
-
-function install-salt() {
-  server_binary_tar="/vagrant/server/kubernetes-server-linux-amd64.tar.gz"
-  if [[ ! -f "$server_binary_tar" ]]; then
-    server_binary_tar="/vagrant/_output/release-tars/kubernetes-server-linux-amd64.tar.gz"
-  fi
-  if [[ ! -f "$server_binary_tar" ]]; then
-    release_not_found
-  fi
-
-  salt_tar="/vagrant/server/kubernetes-salt.tar.gz"
-  if [[ ! -f "$salt_tar" ]]; then
-    salt_tar="/vagrant/_output/release-tars/kubernetes-salt.tar.gz"
-  fi
-  if [[ ! -f "$salt_tar" ]]; then
-    release_not_found
-  fi
-
-  echo "Running release install script"
-  rm -rf /kube-install
-  mkdir -p /kube-install
-  pushd /kube-install
-  tar xzf "$salt_tar"
-  cp "$server_binary_tar" .
-  ./kubernetes/saltbase/install.sh "${server_binary_tar##*/}"
-  popd
-
-  if ! which salt-call >/dev/null 2>&1; then
-    # Install salt from official repositories.
-    # Need to enable testing-repos to get version of salt with fix for dnf-core-plugins
-    dnf config-manager --set-enabled updates-testing
-    dnf install -y salt-minion
-
-    # Fedora >= 23 includes salt packages but the bootstrap is
-    # creating configuration for a (non-existent) salt repo anyway.
-    # Remove the invalid repo to prevent dnf from warning about it on
-    # every update.  Assume this problem is specific to Fedora 23 and
-    # will fixed by the time another version of Fedora lands.
-    local fedora_version=$(grep 'VERSION_ID' /etc/os-release | sed 's+VERSION_ID=++')
-    if [[ "${fedora_version}" = '23' ]]; then
-      local repo_file='/etc/yum.repos.d/saltstack-salt-fedora-23.repo'
-      if [[ -f "${repo_file}" ]]; then
-        rm "${repo_file}"
-      fi
-    fi
-
-  fi
-}
-
-function run-salt() {
-  echo "  Now waiting for the Salt provisioning process to complete on this machine."
-  echo "  This can take some time based on your network, disk, and cpu speed."
-  salt-call --local state.highstate
-}
-
-function create-salt-kubelet-auth() {
-  local -r kubelet_kubeconfig_folder="/srv/salt-overlay/salt/kubelet"
-  mkdir -p "${kubelet_kubeconfig_folder}"
-  (umask 077;
-  cat > "${kubelet_kubeconfig_folder}/kubeconfig" << EOF
-apiVersion: v1
-kind: Config
-clusters:
-- cluster:
-    server: "https://${MASTER_IP}"
-    insecure-skip-tls-verify: true
-  name: local
-contexts:
-- context:
-    cluster: local
-    user: kubelet
-  name: service-account-context
-current-context: service-account-context
-users:
-- name: kubelet
-  user:
-    token: ${KUBELET_TOKEN}
-EOF
-  )
-}
-
-function create-salt-kubeproxy-auth() {
-  kube_proxy_kubeconfig_folder="/srv/salt-overlay/salt/kube-proxy"
-  mkdir -p "${kube_proxy_kubeconfig_folder}"
-  (umask 077;
-  cat > "${kube_proxy_kubeconfig_folder}/kubeconfig" << EOF
-apiVersion: v1
-kind: Config
-clusters:
-- cluster:
-    insecure-skip-tls-verify: true
-  name: local
-contexts:
-- context:
-    cluster: local
-    user: kube-proxy
-  name: service-account-context
-current-context: service-account-context
-users:
-- name: kube-proxy
-  user:
-    token: ${KUBE_PROXY_TOKEN}
-EOF
-  )
-}

test/e2e/framework/test_context.go

@@ -225,7 +225,7 @@ func RegisterClusterFlags() {
 	flag.StringVar(&TestContext.KubeVolumeDir, "volume-dir", "/var/lib/kubelet", "Path to the directory containing the kubelet volumes.")
 	flag.StringVar(&TestContext.CertDir, "cert-dir", "", "Path to the directory containing the certs. Default is empty, which doesn't use certs.")
 	flag.StringVar(&TestContext.RepoRoot, "repo-root", "../../", "Root directory of kubernetes repository, for finding test files.")
-	flag.StringVar(&TestContext.Provider, "provider", "", "The name of the Kubernetes provider (gce, gke, local, vagrant, etc.)")
+	flag.StringVar(&TestContext.Provider, "provider", "", "The name of the Kubernetes provider (gce, gke, local, etc.)")
 	flag.StringVar(&TestContext.KubectlPath, "kubectl-path", "kubectl", "The kubectl binary to use. For development, you might use 'cluster/kubectl.sh' here.")
 	flag.StringVar(&TestContext.OutputDir, "e2e-output-dir", "/tmp", "Output directory for interesting/useful test data, like performance data, benchmarks, and other metrics.")
 	flag.StringVar(&TestContext.Prefix, "prefix", "e2e", "A prefix to be added to cloud resources created during testing.")

test/e2e/framework/util.go

@@ -3454,12 +3454,6 @@ func GetSigner(provider string) (ssh.Signer, error) {
 		}
 		// Otherwise revert to home dir
 		keyfile = "kube_aws_rsa"
-	case "vagrant":
-		keyfile = os.Getenv("VAGRANT_SSH_KEY")
-		if len(keyfile) != 0 {
-			return sshutil.MakePrivateKeySignerFromFile(keyfile)
-		}
-		return nil, fmt.Errorf("VAGRANT_SSH_KEY env variable should be provided")
 	case "local", "vsphere":
 		keyfile = os.Getenv("LOCAL_SSH_KEY") // maybe?
 		if len(keyfile) == 0 {