Merge pull request #405 from humblec/driver-version

Driver version updated to 1.1.0
This commit is contained in:
Humble Devassy Chirammal 2019-07-12 13:55:56 +05:30 committed by GitHub
commit c7ba26d23d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 22 additions and 25 deletions

View File

@ -5,10 +5,10 @@ push_helm_charts() {
CHANGED=0 CHANGED=0
VERSION=$(grep 'version:' deploy/"$PACKAGE"/helm/Chart.yaml | awk '{print $2}') 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 CHANGED=1
ln -s helm deploy/"$PACKAGE"/ceph-csi-"$PACKAGE" 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 pushd tmp/csi-charts/docs/"$PACKAGE" >/dev/null
helm init --client-only helm init --client-only
helm package ../../../../deploy/"$PACKAGE"/ceph-csi-"$PACKAGE" helm package ../../../../deploy/"$PACKAGE"/ceph-csi-"$PACKAGE"
@ -24,11 +24,8 @@ push_helm_charts() {
fi fi
} }
if [ "${TRAVIS_BRANCH}" == 'csi-v0.3' ]; then if [ "${TRAVIS_BRANCH}" == 'release-v1.1.0' ]; then
export ENV_RBD_IMAGE_VERSION='v0.3-canary' export ENV_CSI_IMAGE_VERSION='v1.1.0'
export ENV_CEPHFS_IMAGE_VERSION='v0.3-canary'
elif [ "${TRAVIS_BRANCH}" == 'master' ]; then
export ENV_CSI_IMAGE_VERSION='canary'
else else
echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting" echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting"
exit 0 # Exiting 0 so that this isn't marked as failing exit 0 # Exiting 0 so that this isn't marked as failing

View File

@ -1,10 +1,10 @@
--- ---
apiVersion: v1 apiVersion: v1
appVersion: "1.0.0" appVersion: "1.1.0"
description: "Container Storage Interface (CSI) driver, description: "Container Storage Interface (CSI) driver,
provisioner, and attacher for Ceph cephfs" provisioner, and attacher for Ceph cephfs"
name: ceph-csi-cephfs name: ceph-csi-cephfs
version: 0.8.0 version: 1.1.0
keywords: keywords:
- ceph - ceph
- cephfs - cephfs

View File

@ -51,8 +51,8 @@ nodeplugin:
plugin: plugin:
image: image:
repository: quay.io/cephcsi/cephcsi repository: quay.io/cephcsi/cephcsi
# for stable functionality replace canary with latest release version # for stable functionality replace v1.1.0 with latest release version
tag: canary tag: v1.1.0
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
resources: {} resources: {}

View File

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

View File

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

View File

@ -1,10 +1,10 @@
--- ---
apiVersion: v1 apiVersion: v1
appVersion: "1.0.0" appVersion: "1.1.0"
description: "Container Storage Interface (CSI) driver, description: "Container Storage Interface (CSI) driver,
provisioner, snapshotter, and attacher for Ceph RBD" provisioner, snapshotter, and attacher for Ceph RBD"
name: ceph-csi-rbd name: ceph-csi-rbd
version: 0.8.0 version: 1.1.0
keywords: keywords:
- ceph - ceph
- rbd - rbd

View File

@ -52,8 +52,8 @@ nodeplugin:
plugin: plugin:
image: image:
repository: quay.io/cephcsi/cephcsi repository: quay.io/cephcsi/cephcsi
# for stable functionality replace canary with latest release version # for stable functionality replace v1.1.0 with latest release version
tag: canary tag: v1.1.0
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
resources: {} resources: {}

View File

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

View File

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

View File

@ -27,7 +27,7 @@ import (
const ( const (
// version of ceph driver // version of ceph driver
version = "1.0.0" version = "1.1.0"
// volIDVersion is the version number of volume ID encoding scheme // volIDVersion is the version number of volume ID encoding scheme
volIDVersion uint16 = 1 volIDVersion uint16 = 1

View File

@ -46,7 +46,7 @@ type Driver struct {
} }
var ( var (
version = "1.0.0" version = "1.1.0"
// PluginFolder defines the location of ceph plugin // PluginFolder defines the location of ceph plugin
PluginFolder = "/var/lib/kubelet/plugins/" PluginFolder = "/var/lib/kubelet/plugins/"