commit bc80737c8aebd3be71156a418bd52d214f1c89b2
author Matteo Scandolo <teo@opennetworking.org> Tue Jan 08 22:11:52 2019 +0000
committer Gerrit Code Review <gerrit@opencord.org> Tue Jan 08 22:11:52 2019 +0000
tree b27710f9508ae0526dbf0ce32dfeb616792e419d
parent 032a1d2926437a6565cbfc237b989bd4d8f86e55
parent 84fe2a1448b09015b22716d7e06609518d19c7fc

Merge "Use kubespray 2.8.1 and use multus by default"

VERSION

diff --git a/VERSION b/VERSION
index 4b740cb..dfda3e0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.1.0-dev
+6.1.0

seba-in-a-box/Makefile

diff --git a/seba-in-a-box/Makefile b/seba-in-a-box/Makefile
index 834c271..fffc132 100644
--- a/seba-in-a-box/Makefile
+++ b/seba-in-a-box/Makefile
@@ -11,11 +11,15 @@
 INFRA_CHARTS    ?=
 INFRA_PREREQS   = $(foreach chart,$(INFRA_CHARTS),$(M)/$(chart))
 
-HELM_VERSION    ?= "2.10.0"
-HELM_SHA256SUM  ?= "0fa2ed4983b1e4a3f90f776d08b88b0c73fd83f305b5b634175cb15e61342ffe"
+DOCKER_VERSION  ?= "17.06"
+
+K8S_VERSION     ?= "1.12.4"
+
+HELM_VERSION    ?= "2.12.1"
+HELM_SHA256SUM  ?= "891004bec55431b39515e2cedc4f4a06e93782aa03a4904f2bd742b168160451"
 HELM_PLATFORM   ?= "linux-amd64"
 
-KAFKA_CHART_VERSION  ?= 0.8.8
+KAFKA_CHART_VERSION  ?= 0.13.3
 KAFKA_POD := "pod/cord-kafka-0"
 
 # Targets
@@ -50,14 +54,14 @@
 	sudo apt-key adv --keyserver keyserver.ubuntu.com --recv 0EBFCD88
 	sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(shell lsb_release -cs) stable"
 	sudo apt update
-	sudo apt install -y "docker-ce=17.03*"
+	sudo apt install -y "docker-ce=${DOCKER_VERSION}*"
 
 /usr/bin/kubeadm: | $(M)/setup /usr/bin/docker
 	curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
 	echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" > /tmp/kubernetes.list
 	sudo cp /tmp/kubernetes.list /etc/apt/sources.list.d/kubernetes.list
 	sudo apt update
-	sudo apt install -y "kubeadm=1.11.3-*" "kubelet=1.11.3-*" "kubectl=1.11.3-*"
+	sudo apt install -y "kubeadm=${K8S_VERSION}-*" "kubelet=${K8S_VERSION}-*" "kubectl=${K8S_VERSION}-*"
 
 /usr/local/bin/helm:
 	curl -L -o /tmp/helm.tgz "https://storage.googleapis.com/kubernetes-helm/helm-v${HELM_VERSION}-${HELM_PLATFORM}.tar.gz"
@@ -71,7 +75,8 @@
 	mkdir -p $(HOME)/.kube
 	sudo cp -f /etc/kubernetes/admin.conf $(HOME)/.kube/config
 	sudo chown $(shell id -u):$(shell id -g) $(HOME)/.kube/config
-	kubectl apply -f https://docs.projectcalico.org/v2.6/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml
+	kubectl apply -f https://docs.projectcalico.org/v3.3/getting-started/kubernetes/installation/hosted/rbac-kdd.yaml
+	kubectl apply -f https://docs.projectcalico.org/v3.3/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.7/calico.yaml
 	kubectl taint nodes --all node-role.kubernetes.io/master-
 	touch $@