build: update templates for v3.1.0 release

updated required templates for v3.1.0 release. Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
ceph · Aug 13, 2020 · 5d48473 · 5d48473
1 parent 7111f03
commit 5d48473
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ services:
 language: go
 branches:
   only:
-    - release-v3.0
+    - release-v3.1
 
 env:
   global:

diff --git a/build.env b/build.env
@@ -41,3 +41,6 @@ CHANGE_MINIKUBE_NONE_USER=true
 E2E_TIMEOUT=60m
 DEPLOY_TIMEOUT=10
 UPGRADE_VERSION=v3.0.0
+
+# This var will be used by CentOS CI to build the image
+CSI_IMAGE_VERSION=v3.1.0
diff --git a/charts/ceph-csi-cephfs/Chart.yaml b/charts/ceph-csi-cephfs/Chart.yaml
@@ -1,10 +1,10 @@
 ---
 apiVersion: v1
-appVersion: canary
+appVersion: v3.1.0
 description: "Container Storage Interface (CSI) driver,
 provisioner, snapshotter and attacher for Ceph cephfs"
 name: ceph-csi-cephfs
-version: 1.3.0-canary
+version: 3.1.0-canary
 keywords:
   - ceph
   - cephfs

diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml
@@ -75,7 +75,7 @@ nodeplugin:
   plugin:
     image:
       repository: quay.io/cephcsi/cephcsi
-      tag: canary
+      tag: v3.1.0
       pullPolicy: IfNotPresent
     resources: {}
 

diff --git a/charts/ceph-csi-rbd/Chart.yaml b/charts/ceph-csi-rbd/Chart.yaml
@@ -1,10 +1,10 @@
 ---
 apiVersion: v1
-appVersion: canary
+appVersion: v3.1.0
 description: "Container Storage Interface (CSI) driver,
 provisioner, snapshotter, and attacher for Ceph RBD"
 name: ceph-csi-rbd
-version: 1.3.0-canary
+version: 3.1.0-canary
 keywords:
   - ceph
   - rbd

diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml
@@ -87,7 +87,7 @@ nodeplugin:
   plugin:
     image:
       repository: quay.io/cephcsi/cephcsi
-      tag: canary
+      tag: v3.1.0
       pullPolicy: IfNotPresent
     resources: {}
 

diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml
@@ -99,7 +99,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
           # for stable functionality replace canary with latest release version
-          image: quay.io/cephcsi/cephcsi:canary
+          image: quay.io/cephcsi/cephcsi:v3.1.0
           args:
             - "--nodeid=$(NODE_ID)"
             - "--type=cephfs"
@@ -135,7 +135,7 @@ spec:
             - name: keys-tmp-dir
               mountPath: /tmp/csi/keys
         - name: liveness-prometheus
-          image: quay.io/cephcsi/cephcsi:canary
+          image: quay.io/cephcsi/cephcsi:v3.1.0
           args:
             - "--type=liveness"
             - "--endpoint=$(CSI_ENDPOINT)"

diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
@@ -54,7 +54,7 @@ spec:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
           # for stable functionality replace canary with latest release version
-          image: quay.io/cephcsi/cephcsi:canary
+          image: quay.io/cephcsi/cephcsi:v3.1.0
           args:
             - "--nodeid=$(NODE_ID)"
             - "--type=cephfs"
@@ -104,7 +104,7 @@ spec:
         - name: liveness-prometheus
           securityContext:
             privileged: true
-          image: quay.io/cephcsi/cephcsi:canary
+          image: quay.io/cephcsi/cephcsi:v3.1.0
           args:
             - "--type=liveness"
             - "--endpoint=$(CSI_ENDPOINT)"

diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml
@@ -99,7 +99,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
           # for stable functionality replace canary with latest release version
-          image: quay.io/cephcsi/cephcsi:canary
+          image: quay.io/cephcsi/cephcsi:v3.1.0
           args:
             - "--nodeid=$(NODE_ID)"
             - "--type=rbd"
@@ -139,7 +139,7 @@ spec:
             - name: keys-tmp-dir
               mountPath: /tmp/csi/keys
         - name: liveness-prometheus
-          image: quay.io/cephcsi/cephcsi:canary
+          image: quay.io/cephcsi/cephcsi:v3.1.0
           args:
             - "--type=liveness"
             - "--endpoint=$(CSI_ENDPOINT)"

diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml
@@ -55,7 +55,7 @@ spec:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
           # for stable functionality replace canary with latest release version
-          image: quay.io/cephcsi/cephcsi:canary
+          image: quay.io/cephcsi/cephcsi:v3.1.0
           args:
             - "--nodeid=$(NODE_ID)"
             - "--type=rbd"
@@ -107,7 +107,7 @@ spec:
         - name: liveness-prometheus
           securityContext:
             privileged: true
-          image: quay.io/cephcsi/cephcsi:canary
+          image: quay.io/cephcsi/cephcsi:v3.1.0
           args:
             - "--type=liveness"
             - "--endpoint=$(CSI_ENDPOINT)"

diff --git a/scripts/minikube.sh b/scripts/minikube.sh
@@ -219,7 +219,7 @@ teardown-rook)
     ;;
 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:v3.1.0 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v3.1.0
     ;;
 k8s-sidecar)
     echo "copying the kubernetes sidecar images"