Update vagrant and scripts that support setting k8s version

Author: Wei Tie

Makefile

@@ -7,7 +7,7 @@
 
 DEFAULT_DOCKER_VERSION := 1.12.6
 V2PLUGIN_DOCKER_VERSION := 1.13.1
-DEFAULT_CONTIV_K8S_VERSION := v1.8.6
+CONTIV_K8S_VERSION := stable
 SHELL := /bin/bash
 # TODO: contivmodel should be removed once its code passes golint and misspell
 EXCLUDE_DIRS := bin docs Godeps scripts vagrant vendor install contivmodel
@@ -137,7 +137,7 @@ start:
 # kubernetes cluster bringup/cleanup targets
 k8s-cluster:
 	vagrant plugin install vagrant-cachier
-	cd vagrant/k8s/ && vagrant up
+	cd vagrant/k8s/ && CONTIV_K8S_VERSION=$(CONTIV_K8S_VERSION) vagrant up
 
 k8s-l3-cluster:
 	CONTIV_L3=1 make k8s-cluster
@@ -152,7 +152,7 @@ k8s-l3-destroy:
 # kubernetes test targets
 k8s-test:
 	CONTIV_TEST=1 make k8s-cluster
-	cd vagrant/k8s/ && vagrant ssh k8master -c 'bash -lc "cd /opt/gopath/src/github.com/contiv/netplugin && make run-build"'
+	cd vagrant/k8s/ && vagrant ssh k8master -c 'bash -lc "cd /opt/gopath/src/github.com/contiv/netplugin && make deps checks clean compile"'
 	cd $(GOPATH)/src/github.com/contiv/netplugin/scripts/python && PYTHONIOENCODING=utf-8 ./createcfg.py -scheduler 'k8s' -binpath contiv/bin -install_mode 'kubeadm'
 	CONTIV_K8S_USE_KUBEADM=1 CONTIV_NODES=3 go test -v -timeout 540m ./test/systemtests -check.v -check.abort -check.f $(K8S_SYSTEM_TESTS_TO_RUN)
 	cd vagrant/k8s && vagrant destroy -f

install/k8s/cluster/bootstrap_centos.sh

@@ -5,7 +5,7 @@ if [ $EUID -ne 0 ]; then
   exit 1
 fi
 
-set -e
+set -ex
 
 swapoff -a
 setenforce 0
@@ -38,14 +38,16 @@ EOF
 
 sysctl --system
 
-yum remove -y docker \
-                  docker-common \
-                  container-selinux \
-                  docker-selinux \
-                  docker-engine \
-                  docker-engine-selinux
+yum remove -y docker docker-common container-selinux docker-selinux docker-engine docker-engine-selinux
+yum install -y docker
+systemctl enable docker && systemctl start docker
 
-yum install -y docker kubelet kubeadm kubectl
+k8s_version="$1"
+if [ "$k8s_version" = "stable" ]; then
+    yum install -y kubelet kubeadm kubectl
+else
+    v="${k8s_version#v}"
+    yum install -y "kubelet-$v" "kubeadm-$v" "kubectl-$v"
+fi
 
-systemctl enable docker && systemctl start docker
 systemctl enable kubelet && systemctl start kubelet

install/k8s/cluster/k8smaster_centos.sh

@@ -1,9 +1,9 @@
 #!/bin/bash -x
-kubeadm init --token $1 --apiserver-advertise-address $2 --ignore-preflight-errors all --kubernetes-version $3
-
+kubeadm init --token $1 --apiserver-advertise-address $2 --apiserver-bind-port $3 --kubernetes-version $4
+# --ignore-preflight-errors all
 kubectl taint nodes --all node-role.kubernetes.io/master-
 
-if [ ! -z "$CONTIV_TEST" ]; then
+if [ -n "$CONTIV_TEST" ]; then
     cp /etc/kubernetes/admin.conf /shared/admin.conf
     chmod 0644 /etc/kubernetes/admin.conf
     cd /opt/gopath/src/github.com/contiv/netplugin/install/k8s/contiv/

install/k8s/cluster/k8sworker_centos.sh

@@ -1,5 +1,6 @@
 #!/bin/bash -x
-kubeadm join --token "$1" "$2" --ignore-preflight-errors all --discovery-token-unsafe-skip-ca-verification
+kubeadm join --token "$1" "$2" --discovery-token-unsafe-skip-ca-verification
+# --ignore-preflight-errors all
 if [ ! -z "$CONTIV_TEST" ]; then
     cp /shared/admin.conf /etc/kubernetes/admin.conf
     chmod 0644 /etc/kubernetes/admin.conf

install/k8s/contiv/base.yaml

@@ -19,7 +19,6 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: contiv-netplugin
-  namespace: kube-system
 rules:
   - apiGroups:
     - ""
@@ -68,7 +67,6 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: contiv-netmaster
-  namespace: kube-system
 rules:
   - apiGroups:
     - ""
@@ -79,6 +77,7 @@ rules:
       - namespaces
       - networkpolicies
     verbs:
+      - get
       - watch
       - list
       - update

scripts/netContain/scripts/contivNet.sh

@@ -57,7 +57,6 @@ if [ "$CONTIV_ROLE" = "netmaster" ]; then
     echo "INFO: Starting contiv netmaster"
     /contiv/bin/netmaster $@
 elif [ "$CONTIV_ROLE" = "netplugin" ]; then
-    mkdir -p /opt/cni/bin
     cp /contiv/bin/contivk8s /opt/cni/bin/
     echo "INFO: Starting contiv netplugin"
     /contiv/bin/netplugin $@

vagrant/k8s/Vagrantfile

@@ -205,13 +205,17 @@ Vagrant.configure(2) do |config|
           EOS
         end
 
-        c.vm.provision :shell, path: '../../install/k8s/cluster/bootstrap_centos.sh'
+        if !ENV['CONTIV_K8S_VERSION'].nil? && !ENV['CONTIV_K8S_VERSION'].empty?
+          k8s_version = ENV['CONTIV_K8S_VERSION']
+        else
+          k8s_version = 'stable'
+        end
+
+        c.vm.provision :shell, path: '../../install/k8s/cluster/bootstrap_centos.sh', args: [k8s_version]
         if role == 'master'
           c.vm.network 'forwarded_port', guest: 9999, host: 9999
           # Install kubernetes on master
-          # With the latest 1.4.4 kube*, kubeadm hangs frequently while waiting for the control plane to be available.
-          # So using v1.4.1 as per https://github.com/kubernetes/kubernetes/issues/33729
-          c.vm.provision :shell, path: '../../install/k8s/cluster/k8smaster_centos.sh', args: [token, member_info['contiv_control_ip'], ENV['CONTIV_K8S_VERSION'] || 'stable']
+          c.vm.provision :shell, path: '../../install/k8s/cluster/k8smaster_centos.sh', args: [token, master_ip, master_port, k8s_version]
         else
           # Install kubernetes on nodes
           c.vm.provision :shell, path: '../../install/k8s/cluster/k8sworker_centos.sh', args: [token, "#{master_ip}:#{master_port}"]