From 9168a5ee09d9e76dc68f44484bf3fddbeaed3df3 Mon Sep 17 00:00:00 2001
From: Madhu Rajanna <madhupr007@gmail.com>
Date: Thu, 5 Sep 2019 12:37:48 +0530
Subject: [PATCH] update canary to v1.2.0 to push cephcsi image

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
---
 .travis.yml         | 2 +-
 Makefile            | 2 +-
 README.md           | 5 +++--
 deploy.sh           | 7 ++-----
 scripts/minikube.sh | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a7d11e41a..9755cfdb1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ services:
 language: go
 branches:
   only:
-    - csi-v0.3
+    - release-v1.2.0
     - master
 
 go: 1.12.x
diff --git a/Makefile b/Makefile
index c8d6e2083..049b4fdfb 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),canary)
+CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v1.2.0)
 
 $(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION))
 
diff --git a/README.md b/README.md
index bcb6dbcf3..d9a94cfdc 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ NOTE:
 ### Ceph-CSI features and available versions
 
 | Plugin | Features                                                  | Feature Status | CSI Driver Version | CSI Spec Version | Ceph Cluster Version | Kubernetes Version |
-|--------|-----------------------------------------------------------|----------------|--------------------|------------------|----------------------|--------------------|
+| ------ | --------------------------------------------------------- | -------------- | ------------------ | ---------------- | -------------------- | ------------------ |
 | RBD    | Dynamically provision, de-provision Block mode RWO volume | GA             | >=v1.0.0           | >=v1.0.0         | >= Mimic             | >= v1.13.0         |
 |        | Dynamically provision, de-provision Block mode RWX volume | GA             | >=v1.0.0           | >=v1.0.0         | >= Mimic             | >= v1.13.0         |
 |        | Dynamically provision, de-provision File mode RWO volume  | GA             | >=v1.0.0           | >=v1.0.0         | >= Mimic             | >= v1.13.0         |
@@ -85,8 +85,9 @@ in the Kubernetes documentation.
 ## Ceph CSI Container images and release compatibility
 
 | Ceph CSI Release/Branch | Container image name         | Image Tag |
-|-------------------------|------------------------------|-----------|
+| ----------------------- | ---------------------------- | --------- |
 | Master (Branch)         | quay.io/cephcsi/cephcsi      | canary    |
+| v1.2.0 (Branch)         | quay.io/cephcsi/cephcsi      | v1.2.0    |
 | v1.1.0 (Release)        | quay.io/cephcsi/cephcsi      | v1.1.0    |
 | v1.0.0 (Branch)         | quay.io/cephcsi/cephfsplugin | v1.0.0    |
 | v1.0.0 (Branch)         | quay.io/cephcsi/rbdplugin    | v1.0.0    |
diff --git a/deploy.sh b/deploy.sh
index c483115bd..f5436b44f 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -24,11 +24,8 @@ push_helm_charts() {
 	fi
 }
 
-if [ "${TRAVIS_BRANCH}" == 'csi-v0.3' ]; then
-	export ENV_RBD_IMAGE_VERSION='v0.3-canary'
-	export ENV_CEPHFS_IMAGE_VERSION='v0.3-canary'
-elif [ "${TRAVIS_BRANCH}" == 'master' ]; then
-	export ENV_CSI_IMAGE_VERSION='canary'
+if [ "${TRAVIS_BRANCH}" == 'release-v1.2.0' ]; then
+	export ENV_CSI_IMAGE_VERSION='v1.2.0'
 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 697e8fb31..d2b03148a 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:canary "${CEPHCSI_IMAGE_REPO}"/cephcsi:canary
+    copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.2.0 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.2.0
     ;;
 k8s-sidecar)
     echo "copying the kubernetes sidecar images"