Merge pull request #43 from min-zh/dev

release v1.2.0
yunify · Sep 18, 2020 · 7405064 · 7405064
2 parents 49a7064 + e5d6695
commit 7405064
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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))
+* 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))
diff --git 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/...