From e5d6695d4e61a93c9242b5cfa41f3bd98ebec9aa Mon Sep 17 00:00:00 2001
From: zhangmin <arminzhang@yunify.com>
Date: Fri, 18 Sep 2020 11:34:06 +0800
Subject: [PATCH] release v1.2.0

Signed-off-by: zhangmin <arminzhang@yunify.com>
---
 CHANGELOG.md | 3 ++-
 Makefile     | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d65eac..7967f04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,4 +14,5 @@
 * Update Neonsan api to v2.2.0 ([#30](https://github.com/yunify/qingstor-csi/pull/30))
 * Pool name as a parameter of SC ([#30](https://github.com/yunify/qingstor-csi/pull/30))
 * Update to CSI spec v1.2.0 ([#31](https://github.com/yunify/qingstor-csi/pull/31))
-* Update for k8s 1.17 ([#31](https://github.com/yunify/qingstor-csi/pull/31))
\ No newline at end of file
+* Update for k8s 1.17 ([#31](https://github.com/yunify/qingstor-csi/pull/31))
+* QBD run in container ([#40](https://github.com/yunify/qingstor-csi/pull/40))
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 73cfb70..74b6451 100644
--- a/Makefile
+++ b/Makefile
@@ -17,11 +17,11 @@
 .PHONY: all disk
 
 IMAGE=csiplugin/csi-neonsan
-TAG=canary
+TAG=v1.2.0
 IMAGE_UBUNTU=csiplugin/csi-neonsan-ubuntu
-TAG_UBUNTU=canary
+TAG_UBUNTU=v1.2.0
 IMAGE_CENTOS=csiplugin/csi-neonsan-centos
-TAG_CENTOS=canary
+TAG_CENTOS=v1.2.0
 ROOT_PATH=$(pwd)
 PACKAGE_LIST=./cmd/... ./pkg/...