From e3e8afc0d8cac94ced71617a90a455a5f557b2c9 Mon Sep 17 00:00:00 2001
From: Madhu Rajanna <madhupr007@gmail.com>
Date: Wed, 11 Sep 2019 19:31:59 +0530
Subject: [PATCH] push v1.2-canary image

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
---
 Makefile            | 2 +-
 deploy.sh           | 2 +-
 scripts/minikube.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 049b4fdfb..a82b967e0 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 CONTAINER_CMD?=docker
 
 CSI_IMAGE_NAME=$(if $(ENV_CSI_IMAGE_NAME),$(ENV_CSI_IMAGE_NAME),quay.io/cephcsi/cephcsi)
-CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v1.2.0)
+CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v1.2-canary)
 
 $(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION))
 
diff --git a/deploy.sh b/deploy.sh
index f5436b44f..9ceda6558 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -25,7 +25,7 @@ push_helm_charts() {
 }
 
 if [ "${TRAVIS_BRANCH}" == 'release-v1.2.0' ]; then
-	export ENV_CSI_IMAGE_VERSION='v1.2.0'
+	export ENV_CSI_IMAGE_VERSION='v1.2-canary'
 else
 	echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting"
 	exit 0 # Exiting 0 so that this isn't marked as failing
diff --git a/scripts/minikube.sh b/scripts/minikube.sh
index d2b03148a..3d25a55dc 100755
--- a/scripts/minikube.sh
+++ b/scripts/minikube.sh
@@ -101,7 +101,7 @@ ssh)
     ;;
 cephcsi)
     echo "copying the cephcsi image"
-    copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.2.0 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.2.0
+    copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.2-canary "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.2.0
     ;;
 k8s-sidecar)
     echo "copying the kubernetes sidecar images"