Skip to content

Commit c7ba26d

Browse files
authored
Merge pull request #405 from humblec/driver-version
Driver version updated to 1.1.0
2 parents 4b3bf68 + f476c10 commit c7ba26d

11 files changed

+22
-25
lines changed

deploy.sh

+4-7
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ push_helm_charts() {
55
CHANGED=0
66
VERSION=$(grep 'version:' deploy/"$PACKAGE"/helm/Chart.yaml | awk '{print $2}')
77

8-
if [ ! -f "tmp/csi-charts/docs/$PACKAGE/ceph-csi-$PACKAGE-$VERSION.tgz" ]; then
8+
if [ ! -f "tmp/csi-charts/docs/$PACKAGE/v$VERSION/ceph-csi-$PACKAGE-$VERSION.tgz" ]; then
99
CHANGED=1
1010
ln -s helm deploy/"$PACKAGE"/ceph-csi-"$PACKAGE"
11-
mkdir -p tmp/csi-charts/docs/"$PACKAGE"
11+
mkdir -p tmp/csi-charts/docs/"$PACKAGE/v$VERSION"
1212
pushd tmp/csi-charts/docs/"$PACKAGE" >/dev/null
1313
helm init --client-only
1414
helm package ../../../../deploy/"$PACKAGE"/ceph-csi-"$PACKAGE"
@@ -24,11 +24,8 @@ push_helm_charts() {
2424
fi
2525
}
2626

27-
if [ "${TRAVIS_BRANCH}" == 'csi-v0.3' ]; then
28-
export ENV_RBD_IMAGE_VERSION='v0.3-canary'
29-
export ENV_CEPHFS_IMAGE_VERSION='v0.3-canary'
30-
elif [ "${TRAVIS_BRANCH}" == 'master' ]; then
31-
export ENV_CSI_IMAGE_VERSION='canary'
27+
if [ "${TRAVIS_BRANCH}" == 'release-v1.1.0' ]; then
28+
export ENV_CSI_IMAGE_VERSION='v1.1.0'
3229
else
3330
echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting"
3431
exit 0 # Exiting 0 so that this isn't marked as failing

deploy/cephfs/helm/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
apiVersion: v1
3-
appVersion: "1.0.0"
3+
appVersion: "1.1.0"
44
description: "Container Storage Interface (CSI) driver,
55
provisioner, and attacher for Ceph cephfs"
66
name: ceph-csi-cephfs
7-
version: 0.8.0
7+
version: 1.1.0
88
keywords:
99
- ceph
1010
- cephfs

deploy/cephfs/helm/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ nodeplugin:
5151
plugin:
5252
image:
5353
repository: quay.io/cephcsi/cephcsi
54-
# for stable functionality replace canary with latest release version
55-
tag: canary
54+
# for stable functionality replace v1.1.0 with latest release version
55+
tag: v1.1.0
5656
pullPolicy: IfNotPresent
5757

5858
resources: {}

deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ spec:
6161
privileged: true
6262
capabilities:
6363
add: ["SYS_ADMIN"]
64-
# for stable functionality replace canary with latest release version
65-
image: quay.io/cephcsi/cephcsi:canary
64+
# for stable functionality replace v1.1.0 with latest release version
65+
image: quay.io/cephcsi/cephcsi:v1.1.0
6666
args:
6767
- "--nodeid=$(NODE_ID)"
6868
- "--type=cephfs"

deploy/cephfs/kubernetes/csi-cephfsplugin.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ spec:
4848
capabilities:
4949
add: ["SYS_ADMIN"]
5050
allowPrivilegeEscalation: true
51-
# for stable functionality replace canary with latest release version
52-
image: quay.io/cephcsi/cephcsi:canary
51+
# for stable functionality replace v1.1.0 with latest release version
52+
image: quay.io/cephcsi/cephcsi:v1.1.0
5353
args:
5454
- "--nodeid=$(NODE_ID)"
5555
- "--type=cephfs"

deploy/rbd/helm/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
apiVersion: v1
3-
appVersion: "1.0.0"
3+
appVersion: "1.1.0"
44
description: "Container Storage Interface (CSI) driver,
55
provisioner, snapshotter, and attacher for Ceph RBD"
66
name: ceph-csi-rbd
7-
version: 0.8.0
7+
version: 1.1.0
88
keywords:
99
- ceph
1010
- rbd

deploy/rbd/helm/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ nodeplugin:
5252
plugin:
5353
image:
5454
repository: quay.io/cephcsi/cephcsi
55-
# for stable functionality replace canary with latest release version
56-
tag: canary
55+
# for stable functionality replace v1.1.0 with latest release version
56+
tag: v1.1.0
5757
pullPolicy: IfNotPresent
5858

5959
resources: {}

deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ spec:
7676
privileged: true
7777
capabilities:
7878
add: ["SYS_ADMIN"]
79-
# for stable functionality replace canary with latest release version
80-
image: quay.io/cephcsi/cephcsi:canary
79+
# for stable functionality replace v1.1.0 with latest release version
80+
image: quay.io/cephcsi/cephcsi:v1.1.0
8181
args:
8282
- "--nodeid=$(NODE_ID)"
8383
- "--type=rbd"

deploy/rbd/kubernetes/csi-rbdplugin.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ spec:
4949
capabilities:
5050
add: ["SYS_ADMIN"]
5151
allowPrivilegeEscalation: true
52-
# for stable functionality replace canary with latest release version
53-
image: quay.io/cephcsi/cephcsi:canary
52+
# for stable functionality replace v1.1.0 with latest release version
53+
image: quay.io/cephcsi/cephcsi:v1.1.0
5454
args:
5555
- "--nodeid=$(NODE_ID)"
5656
- "--type=rbd"

pkg/cephfs/driver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
const (
2929
// version of ceph driver
30-
version = "1.0.0"
30+
version = "1.1.0"
3131

3232
// volIDVersion is the version number of volume ID encoding scheme
3333
volIDVersion uint16 = 1

pkg/rbd/rbd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ type Driver struct {
4646
}
4747

4848
var (
49-
version = "1.0.0"
49+
version = "1.1.0"
5050

5151
// PluginFolder defines the location of ceph plugin
5252
PluginFolder = "/var/lib/kubelet/plugins/"

0 commit comments

Comments
 (0)