From cf9a10c7d0282eb69ff21c4d0335c7351f09492b Mon Sep 17 00:00:00 2001
From: Madhu Rajanna <madhupr007@gmail.com>
Date: Thu, 21 Nov 2019 10:39:38 +0530
Subject: [PATCH] Push v1.2-canary image from release-v1.2.0

as part of https://github.com/ceph/ceph-csi/pull/715/
we have updeated the release-v1.2.0 branch to
push v1.2.2 images as the release is done reverting back
the image tag to push 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 f89638c85..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.2)
+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 8c44edb3d..8d337183a 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -34,7 +34,7 @@ push_helm_charts() {
 }
 
 if [ "${TRAVIS_BRANCH}" == 'release-v1.2.0' ]; then
-	export ENV_CSI_IMAGE_VERSION='v1.2.2'
+	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 4836a427c..d7fb3015c 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.2 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.2.2
+    copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.2-canary "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.2.2
     ;;
 k8s-sidecar)
     echo "copying the kubernetes sidecar images"