Resolve "add `undeploy` command"

Closes #1 (closed)

assets/deployer

@@ -3,7 +3,6 @@
 set -o pipefail -o noclobber -o nounset
 
 ## declare used variables
-cmd=""
 image_name="image"
 cluster_name="cluster"
 context="context"
@@ -29,7 +28,7 @@ if [[ ${PIPESTATUS[0]} -ne 4 ]]; then
     exit 1
 fi
 
-OPTIONS=d:,t:,b:,c:,n:,s:
+OPTIONS=
 LONGOPTS=docker-config:,tag:,build-arg:,set:,set-string:,charts:,name:,token:,certificate-authority:,namespace:,cluster-url:,service-account:,output:,input:
 
 # -use ! and PIPESTATUS to get exit code with errexit set
@@ -218,8 +217,8 @@ prepare_helm() {
 	return 0
 }
 
-prepare_helm_command() {
-	echo -ne "Preparing helm command..."
+helm_deploy() {
+	echo -ne "Deploying ${name}..."
 
 	if [ "${name}" == "" ];then
 		echo "failed"
@@ -233,7 +232,19 @@ prepare_helm_command() {
 		return 1
 	fi
 
-	cmd="helm upgrade --install --wait --tiller-namespace=${namespace} --namespace=${namespace}"
+	local out
+	local cmd
+
+	if [ "$(helm ls --tiller-namespace=${namespace} --namespace=${namespace} --pending --deleted --failed --short | grep ${name})" != "" ];then
+		out=`helm delete --tiller-namespace=${namespace} --purge ${name} 2>&1`
+		if [ "$?" != "0" ];then
+			echo "failed"
+			echo "$out"
+			return 1
+		fi
+	fi
+
+	cmd="helm upgrade --install --wait --timeout=60 --tiller-namespace=${namespace} --namespace=${namespace}"
 
 	for set in ${sets};do
 		cmd="$cmd --set ${set}"
@@ -245,24 +256,6 @@ prepare_helm_command() {
 
 	cmd="$cmd ${name} ${charts}"
 
-	echo "done"
-	return 0
-}
-
-helm_deploy() {
-	echo -ne "Deploying ${name}..."
-	local out=""
-
-	# todo: do we need this when we do a "helm upgrade --install" ?
-	# if [ "$(helm ls --tiller-namespace=${namespace} --namespace=${namespace} --deleted --failed --short | grep ${name})" != "" ];then
-	# 	out=`helm delete --tiller-namespace=${namespace} --purge ${name} 2>&1`
-	# 	if [ "$?" != "0" ];then
-	# 		echo "failed"
-	# 		echo "$out"
-	# 		return 1
-	# 	fi
-	# fi
-
 	out=`$cmd 2>&1`
 	if [ "$?" != "0" ];then
 		echo "failed"
@@ -273,23 +266,26 @@ helm_deploy() {
 	echo "done"
 }
 
-test_helm_deploy() {
-	echo -ne "Waiting for successful deploy..."
+helm_undeploy() {
+	echo -ne "Undeploying ${name}..."
 
-	counter=0
-	while [ "$(helm ls --tiller-namespace=${namespace} --namespace=${namespace} | grep ${name} | awk -F"\t" '{ print $4; }')" != "DEPLOYED" ]; do
-		sleep 1
-		if [ $counter -eq 60 ];then
-			break
-		fi
-		counter=$[$counter+1]
-	done
-	if [ $counter -eq 60 ];then
+	if [ "${name}" == "" ];then
+		echo "failed"
+		echo "no deploy name specified"
+		return 1
+	fi
+
+	local out
+
+	out=`helm delete --tiller-namespace=${namespace} ${name} 2>&1`
+
+	if [ "$?" != "0" ];then
 		echo "failed"
+		echo "$out"
 		return 1
 	fi
+
 	echo "done"
-	return 0
 }
 
 prepare_image_publisher() {
@@ -309,17 +305,6 @@ prepare_image_publisher() {
 	return 0
 }
 
-prepare_image_builder() {
-	cmd="docker build --pull"
-	for arg in $buildargs;do
-		echo "adding $arg to build command"
-		cmd="$cmd --build-arg $arg --build-arg ${arg,,}"
-	done
-
-	cmd="$cmd -t ${image_name} ."
-	return 0
-}
-
 save_image() {
 	local out
 	echo -ne "saving image ..."
@@ -341,8 +326,17 @@ save_image() {
 }
 
 build_image() {
-	local out
 	echo -ne "building image..."
+
+	local out
+	local cmd="docker build --pull"
+
+	for arg in $buildargs;do
+		echo "adding $arg to build command"
+		cmd="$cmd --build-arg $arg --build-arg ${arg,,}"
+	done
+
+	cmd="$cmd -t ${image_name} ."
 	out=`$cmd 2>&1`
 	if [ "$?" != "0" ];then
 		echo "failed"
@@ -424,13 +418,16 @@ fi
 
 case $1 in
 	build)
-		prepare_image_builder && build_image && save_image
+		build_image && save_image
 		;;
 	publish)
 		prepare_image_publisher && import_image && publish_image
 		;;
 	deploy)
-		prepare_kubectl && prepare_helm && prepare_helm_command && helm_deploy && test_helm_deploy
+		prepare_kubectl && prepare_helm && helm_deploy
+		;;
+	undeploy)
+		prepare_kubectl && prepare_helm && helm_undeploy
 		;;
 	help)
 		echo "help"