Merge pull request #405 from humblec/driver-version

Driver version updated to 1.1.0
ceph · Jul 12, 2019 · c7ba26d · c7ba26d
2 parents 4b3bf68 + f476c10
commit c7ba26d
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 25 deletions.
diff --git a/deploy.sh b/deploy.sh
@@ -5,10 +5,10 @@ push_helm_charts() {
 	CHANGED=0
 	VERSION=$(grep 'version:' deploy/"$PACKAGE"/helm/Chart.yaml | awk '{print $2}')
 
-	if [ ! -f "tmp/csi-charts/docs/$PACKAGE/ceph-csi-$PACKAGE-$VERSION.tgz" ]; then
+	if [ ! -f "tmp/csi-charts/docs/$PACKAGE/v$VERSION/ceph-csi-$PACKAGE-$VERSION.tgz" ]; then
 		CHANGED=1
 		ln -s helm deploy/"$PACKAGE"/ceph-csi-"$PACKAGE"
-		mkdir -p tmp/csi-charts/docs/"$PACKAGE"
+		mkdir -p tmp/csi-charts/docs/"$PACKAGE/v$VERSION"
 		pushd tmp/csi-charts/docs/"$PACKAGE" >/dev/null
 		helm init --client-only
 		helm package ../../../../deploy/"$PACKAGE"/ceph-csi-"$PACKAGE"
@@ -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.1.0' ]; then
+	export ENV_CSI_IMAGE_VERSION='v1.1.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/deploy/cephfs/helm/Chart.yaml b/deploy/cephfs/helm/Chart.yaml
@@ -1,10 +1,10 @@
 ---
 apiVersion: v1
-appVersion: "1.0.0"
+appVersion: "1.1.0"
 description: "Container Storage Interface (CSI) driver,
 provisioner, and attacher for Ceph cephfs"
 name: ceph-csi-cephfs
-version: 0.8.0
+version: 1.1.0
 keywords:
   - ceph
   - cephfs

diff --git a/deploy/cephfs/helm/values.yaml b/deploy/cephfs/helm/values.yaml
@@ -51,8 +51,8 @@ nodeplugin:
   plugin:
     image:
       repository: quay.io/cephcsi/cephcsi
-      # for stable functionality replace canary with latest release version
-      tag: canary
+      # for stable functionality replace v1.1.0 with latest release version
+      tag: v1.1.0
       pullPolicy: IfNotPresent
 
     resources: {}

diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml
@@ -61,8 +61,8 @@ spec:
             privileged: true
             capabilities:
               add: ["SYS_ADMIN"]
-          # for stable functionality replace canary with latest release version
-          image: quay.io/cephcsi/cephcsi:canary
+          # for stable functionality replace v1.1.0 with latest release version
+          image: quay.io/cephcsi/cephcsi:v1.1.0
           args:
             - "--nodeid=$(NODE_ID)"
             - "--type=cephfs"

diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
@@ -48,8 +48,8 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          # for stable functionality replace canary with latest release version
-          image: quay.io/cephcsi/cephcsi:canary
+          # for stable functionality replace v1.1.0 with latest release version
+          image: quay.io/cephcsi/cephcsi:v1.1.0
           args:
             - "--nodeid=$(NODE_ID)"
             - "--type=cephfs"

diff --git a/deploy/rbd/helm/Chart.yaml b/deploy/rbd/helm/Chart.yaml
@@ -1,10 +1,10 @@
 ---
 apiVersion: v1
-appVersion: "1.0.0"
+appVersion: "1.1.0"
 description: "Container Storage Interface (CSI) driver,
 provisioner, snapshotter, and attacher for Ceph RBD"
 name: ceph-csi-rbd
-version: 0.8.0
+version: 1.1.0
 keywords:
   - ceph
   - rbd

diff --git a/deploy/rbd/helm/values.yaml b/deploy/rbd/helm/values.yaml
@@ -52,8 +52,8 @@ nodeplugin:
   plugin:
     image:
       repository: quay.io/cephcsi/cephcsi
-      # for stable functionality replace canary with latest release version
-      tag: canary
+      # for stable functionality replace v1.1.0 with latest release version
+      tag: v1.1.0
       pullPolicy: IfNotPresent
 
     resources: {}

diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml
@@ -76,8 +76,8 @@ spec:
             privileged: true
             capabilities:
               add: ["SYS_ADMIN"]
-          # for stable functionality replace canary with latest release version
-          image: quay.io/cephcsi/cephcsi:canary
+          # for stable functionality replace v1.1.0 with latest release version
+          image: quay.io/cephcsi/cephcsi:v1.1.0
           args:
             - "--nodeid=$(NODE_ID)"
             - "--type=rbd"

diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml
@@ -49,8 +49,8 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          # for stable functionality replace canary with latest release version
-          image: quay.io/cephcsi/cephcsi:canary
+          # for stable functionality replace v1.1.0 with latest release version
+          image: quay.io/cephcsi/cephcsi:v1.1.0
           args:
             - "--nodeid=$(NODE_ID)"
             - "--type=rbd"

diff --git a/pkg/cephfs/driver.go b/pkg/cephfs/driver.go
@@ -27,7 +27,7 @@ import (
 
 const (
 	// version of ceph driver
-	version = "1.0.0"
+	version = "1.1.0"
 
 	// volIDVersion is the version number of volume ID encoding scheme
 	volIDVersion uint16 = 1

diff --git a/pkg/rbd/rbd.go b/pkg/rbd/rbd.go
@@ -46,7 +46,7 @@ type Driver struct {
 }
 
 var (
-	version = "1.0.0"
+	version = "1.1.0"
 
 	// PluginFolder defines the location of ceph plugin
 	PluginFolder = "/var/lib/kubelet/plugins/"