From 8f7c7e6b413876220c7bbe536aa6e6126c58ba6a Mon Sep 17 00:00:00 2001
From: Roman Mohr <rmohr@redhat.com>
Date: Thu, 4 Jan 2018 18:03:26 +0100
Subject: [PATCH] Add support for provider config

Give providers a place where they can write their default config values,
while still giving people the chance to use hack/cluster-local.sh to
override any defaults or provider defaults.

Signed-off-by: Roman Mohr <rmohr@redhat.com>
---
 .gitignore                    |  2 ++
 Vagrantfile                   |  8 ++++++++
 cluster/deploy.sh             |  4 ----
 cluster/kubectl.sh            | 23 ++++-------------------
 cluster/local/provider.sh     | 11 ++++++-----
 cluster/vagrant/provider.sh   | 13 ++++++++-----
 cluster/vm-isolation-check.sh |  0
 hack/build-go.sh              |  5 ++++-
 hack/config-default.sh        |  1 +
 hack/config.sh                | 11 ++++++++---
 tests/README.md               |  6 ++++--
 11 files changed, 45 insertions(+), 39 deletions(-)
 delete mode 100755 cluster/vm-isolation-check.sh

diff --git a/.gitignore b/.gitignore
index 5abdb95bfc1f..879421e26659 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,8 @@ tags
 hack/gen-swagger-doc/*.adoc
 hack/gen-swagger-doc/*.md
 hack/gen-swagger-doc/html5
+hack/config-provider-local.sh
+hack/config-provider-vagrant.sh
 cluster/local/certs
 **.swp
 **.pem
diff --git a/Vagrantfile b/Vagrantfile
index 829a927dcc8e..a2c4b929ed6d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,6 +1,14 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+if ARGV.first == "up" && ENV['USING_KUBE_SCRIPTS'] != 'true'
+  raise Vagrant::Errors::VagrantError.new, <<END
+Calling 'vagrant up' directly is not supported.  Instead, please run the following:
+
+  export PROVIDER=vagrant
+  make cluster-up
+END
+end
 
 $use_nfs = ENV['VAGRANT_USE_NFS'] == 'true'
 $use_rng = ENV['VAGRANT_USE_RNG'] == 'true'
diff --git a/cluster/deploy.sh b/cluster/deploy.sh
index 1ceb360abf14..6bab15502699 100755
--- a/cluster/deploy.sh
+++ b/cluster/deploy.sh
@@ -47,10 +47,6 @@ elif [ "$TARGET" = "vagrant-release" ]; then
     _kubectl create -f manifests/release -R $i
 fi
 
-## Expose common services
-$KUBECTL expose deployment haproxy --port 8184 -l 'kubevirt.io=haproxy' -n kube-system --external-ip $master_ip
-$KUBECTL expose deployment spice-proxy --port 3128 -l 'kubevirt.io=spice-proxy' -n kube-system --external-ip $master_ip
-
 # Deploy additional infra for testing
 _kubectl create -f manifests/testing -R $i
 
diff --git a/cluster/kubectl.sh b/cluster/kubectl.sh
index 7a882c1c008d..7c0672b9f141 100755
--- a/cluster/kubectl.sh
+++ b/cluster/kubectl.sh
@@ -18,26 +18,11 @@
 #
 
 PROVIDER=${PROVIDER:-vagrant}
-source cluster/$PROVIDER/provider.sh
+source ${KUBEVIRT_PATH}cluster/$PROVIDER/provider.sh
 source ${KUBEVIRT_PATH}hack/config.sh
 
-if [ "$1" == "console" ] || [ "$1" == "spice" ]; then
-    cmd/virtctl/virtctl "$@" -s http://${master_ip}:8184
-    exit
-fi
-
-# Print usage from virtctl and kubectl
-if [ "$1" == "--help" ] || [ "$1" == "-h" ]; then
-    cmd/virtctl/virtctl "$@"
-fi
-
-if [ -e ${KUBEVIRT_PATH}cluster/vagrant/.kubeconfig ] &&
-    [ -e ${KUBEVIRT_PATH}cluster/vagrant/.kubectl ] &&
-    [ "x$1" == "x--core" ]; then
-    shift
-    _kubectl "$@"
-elif [ -e ${KUBEVIRT_PATH}cluster/vagrant/.kubectl ]; then
-    _kubectl -s http://${master_ip}:8184 "$@"
+if [ "$1" == "console" ] || [ "$1" == "vnc" ]; then
+    cmd/virtctl/virtctl "$@" --kubeconfig=${kubeconfig}
 else
-    echo "Did you already run 'cluster/up.sh' to deploy kubevirt?"
+    _kubectl "$@"
 fi
diff --git a/cluster/local/provider.sh b/cluster/local/provider.sh
index c6f3a86388d5..249453735e86 100644
--- a/cluster/local/provider.sh
+++ b/cluster/local/provider.sh
@@ -11,6 +11,9 @@ function _main_ip() {
 }
 
 function up() {
+    # Make sure that local config is correct
+    prepare_config
+
     go get -d k8s.io/kubernetes
 
     export API_HOST_IP=$(_main_ip)
@@ -29,9 +32,10 @@ function up() {
 }
 
 function prepare_config() {
-    cat >hack/config-local.sh <<EOF
+    cat >hack/config-provider-local.sh <<EOF
 master_ip=$(_main_ip)
 docker_tag=devel
+kubeconfig=$(_cert_dir)/admin.kubeconfig
 EOF
 }
 
@@ -45,8 +49,5 @@ function _kubectl() {
 }
 
 function down() {
-    true
+    echo "Not supported by this provider. Please kill the running script manually."
 }
-
-# Make sure that local config is correct
-prepare_config
diff --git a/cluster/vagrant/provider.sh b/cluster/vagrant/provider.sh
index c92566d90dbe..8181b4485c72 100644
--- a/cluster/vagrant/provider.sh
+++ b/cluster/vagrant/provider.sh
@@ -5,6 +5,7 @@ function _main_ip() {
 }
 
 function up() {
+    export USING_KUBE_SCRIPTS=true
     # Make sure that the vagrant environment is up and running
     vagrant up --provider=libvirt
     # Synchronize kubectl config
@@ -20,12 +21,17 @@ function up() {
     chmod u+x cluster/vagrant/.kubectl
 
     vagrant ssh master -c "sudo cat /etc/kubernetes/admin.conf" >${KUBEVIRT_PATH}cluster/vagrant/.kubeconfig
+
+    # Make sure that local config is correct
+    prepare_config
 }
 
 function prepare_config() {
-    cat >hack/config-local.sh <<EOF
+    BASE_PATH=${KUBEVIRT_PATH:-$PWD}
+    cat >hack/config-provider-vagrant.sh <<EOF
 master_ip=$(_main_ip)
 docker_tag=devel
+kubeconfig=${BASE_PATH}/cluster/vagrant/.kubeconfig
 EOF
 }
 
@@ -33,7 +39,7 @@ function build() {
     make build manifests
     for VM in $(vagrant status | grep -v "^The Libvirt domain is running." | grep running | cut -d " " -f1); do
         vagrant rsync $VM # if you do not use NFS
-        vagrant ssh $VM -c "cd /vagrant && export DOCKER_TAG=devel && sudo -E hack/build-docker.sh build optional"
+        vagrant ssh $VM -c "cd /vagrant && export DOCKER_TAG=${docker_tag} && sudo -E hack/build-docker.sh build &&  sudo -E hack/build-docker.sh build optional"
     done
 }
 
@@ -45,6 +51,3 @@ function _kubectl() {
 function down() {
     vagrant halt
 }
-
-# Make sure that local config is correct
-prepare_config
diff --git a/cluster/vm-isolation-check.sh b/cluster/vm-isolation-check.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/hack/build-go.sh b/hack/build-go.sh
index cee7e9fe2e14..c67f970edab5 100755
--- a/hack/build-go.sh
+++ b/hack/build-go.sh
@@ -43,7 +43,10 @@ if [ $# -eq 0 ]; then
             go ${target} -v ./...
         )
     elif [ "${target}" = "functest" ]; then
-        (cd tests; go test -kubeconfig=../cluster/vagrant/.kubeconfig -timeout 30m ${FUNC_TEST_ARGS})
+        (
+            cd tests
+            go test -kubeconfig=${kubeconfig} -timeout 30m ${FUNC_TEST_ARGS}
+        )
         exit
     else
         (
diff --git a/hack/config-default.sh b/hack/config-default.sh
index 78edb34171d9..9fb1c9231039 100644
--- a/hack/config-default.sh
+++ b/hack/config-default.sh
@@ -5,3 +5,4 @@ docker_prefix=kubevirt
 docker_tag=${DOCKER_TAG:-latest}
 master_ip=192.168.200.2
 network_provider=weave
+kubeconfig=cluster/vagrant/.kubeconfig
diff --git a/hack/config.sh b/hack/config.sh
index 9f7be5a79ce6..0479105f42da 100644
--- a/hack/config.sh
+++ b/hack/config.sh
@@ -1,11 +1,16 @@
 unset binaries docker_images docker_prefix docker_tag manifest_templates \
-      master_ip network_provider
+    master_ip network_provider kubeconfig
 
-source ${KUBEVIRT_PATH}hack/config-default.sh
+PROVIDER=${PROVIDER:-vagrant}
+
+source ${KUBEVIRT_PATH}hack/config-default.sh source ${KUBEVIRT_PATH}hack/config-${PROVIDER}.sh
+
+# Allow different providers to override default config values
+test -f "hack/config-provider-${PROVIDER}.sh" && source hack/config-provider-${PROVIDER}.sh
 
 # Let devs override any default variables, to avoid needing
 # to change the version controlled config-default.sh file
 test -f "hack/config-local.sh" && source hack/config-local.sh
 
 export binaries docker_images docker_prefix docker_tag manifest_templates \
-       master_ip network_provider
+    master_ip network_provider kubeconfig
diff --git a/tests/README.md b/tests/README.md
index 5c920be1c45e..0568fa11163e 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -4,16 +4,18 @@ Integration tests require a running Kubevirt cluster.  Once you have a running
 Kubevirt cluster, you can use the `-master` and the `-kubeconfig` flags to
 point the tests to the cluster.
 
-## Run them on Vagrant
+## Run them on an arbitrary KubeVirt installation
 
 The vagrant environment has an unprotected haproxy in front of the apiserver,
 so only `-master` needs to be set to run the tests.
 
 ```
 cd tests # from the git repo root folder
-go test -master=http://192.168.200.2:8184
+go test -kubeconfig=path/to/my/config
 ```
 
+## Run them on one of the core KubeVirt providers
+
 There is a make target to run this with the config
 taken from hack/config.sh: