From 995788789e6c84b6af1a7d836246a515c637988d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torma=20Krist=C3=B3f?= <tormakristof@tormakristof.eu>
Date: Wed, 3 Apr 2019 12:09:39 +0200
Subject: [PATCH] Update cluster-deploy

---
 cluster-deploy | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/cluster-deploy b/cluster-deploy
index 40eecbf..15895f0 100644
--- a/cluster-deploy
+++ b/cluster-deploy
@@ -15,7 +15,10 @@ WORKER_LIST="worker.list"
 IP=""
 TOKEN=""
 HASH=""
-
+KUBERNETES_VERFILE="kubernetes.version"
+DOCKER_VERFILE="docker.version"
+DOCKER_VERSION=$(echo $(cat $DOCKER_VERFILE)|tr -d '\n')
+KUBERNETES_VERSION=$(echo $(cat $KUBERNETES_VERFILE)|tr -d '\n')
 
 # Functions
 
@@ -63,6 +66,22 @@ if [ ! -f $WORKER_LIST ]; then
 	fi
 fi
 
+if [ ! -f $DOCKER_VERFILE ]; then
+	echo_err "Docker version file ($DOCKER_VERFILE) not exists."
+	exit 1
+	else if [ ! -s $DOCKER_VERFILE ]; then
+		echo_err "Docker version file ($DOCKER_VERFILE) is empty."
+	fi
+fi
+
+if [ ! -f $KUBERNETES_VERFILE ]; then
+	echo_err "Kubernetes version file ($DOCKER_VERFILE) not exists."
+	exit 1
+	else if [ ! -s $DOCKER_VERFILE ]; then
+		echo_err "Kubernetes version file ($DOCKER_VERFILE) is empty."
+	fi
+fi
+
 ## Check for argument
 if [ "$#" -lt 1 ]; then
 	echo_err "Missing CNI plugin name as an argument."
@@ -73,7 +92,7 @@ fi
 CNI=$(tr '[:upper:]' '[:lower:]'  <<< $1)
 
 ## Setup Kubernetes
-./deploy/kubernetes_install.sh
+./deploy/kubernetes_install.sh $DOCKER_vERSION $KUBERNETES_VERSION
 
 ## Initialize Master and install CNI plugin
 case $CNI in
@@ -118,7 +137,7 @@ for LINE in $(cat $WORKER_LIST | grep -vE "^#"); do
 	WORKERNAME=`echo $LINE | awk -F"/" '{print $NF}'`
 
 	echo "[worker:$WORKERNAME] Deploying..."
-	ssh $WORKERNAME -o "StrictHostKeyChecking no" "bash -s" < ./deploy/kubernetes_install.sh true $IP:6443 $TOKEN $HASH
+	ssh $WORKERNAME -o "StrictHostKeyChecking no" "bash -s" < ./deploy/kubernetes_install.sh $DOCKER_vERSION $KUBERNETES_VERSION true $IP:6443 $TOKEN $HASH
 
 	#FIXME Do I need to wait for the worker?
 	wait_for_worker