diff --git a/.travis.yml b/.travis.yml index 8e5519beaa0..ddab4ac4255 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ language: go branches: only: - master + - release-v2.0 go: 1.12.x diff --git a/Makefile b/Makefile index 46cacf91d0c..871dc94550e 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ CONTAINER_CMD?=docker CSI_IMAGE_NAME=$(if $(ENV_CSI_IMAGE_NAME),$(ENV_CSI_IMAGE_NAME),quay.io/cephcsi/cephcsi) -CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),canary) +CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v2.0.0) CSI_IMAGE=$(CSI_IMAGE_NAME):$(CSI_IMAGE_VERSION) $(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION)) diff --git a/README.md b/README.md index 47879767ae0..91b510eb3ca 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,7 @@ in the Kubernetes documentation. | Ceph CSI Release/Branch | Container image name | Image Tag | | ----------------------- | ---------------------------- | --------- | | Master (Branch) | quay.io/cephcsi/cephcsi | canary | +| v2.0.0 (Release) | quay.io/cephcsi/cephcsi | v2.0.0 | | v1.2.2 (Release) | quay.io/cephcsi/cephcsi | v1.2.2 | | v1.2.1 (Release) | quay.io/cephcsi/cephcsi | v1.2.1 | | v1.2.0 (Release) | quay.io/cephcsi/cephcsi | v1.2.0 | diff --git a/charts/ceph-csi-cephfs/Chart.yaml b/charts/ceph-csi-cephfs/Chart.yaml index 8539236fbd8..8fb0819270c 100644 --- a/charts/ceph-csi-cephfs/Chart.yaml +++ b/charts/ceph-csi-cephfs/Chart.yaml @@ -1,10 +1,10 @@ --- apiVersion: v1 -appVersion: canary +appVersion: v2.0.0 description: "Container Storage Interface (CSI) driver, provisioner, and attacher for Ceph cephfs" name: ceph-csi-cephfs -version: 1.3.0-canary +version: 2.0.0-canary keywords: - ceph - cephfs diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index b6397ec5937..36bd6e2dd62 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -104,7 +104,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: canary + tag: v2.0.0 pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/Chart.yaml b/charts/ceph-csi-rbd/Chart.yaml index 1e92dbf52d0..45cd91a158b 100644 --- a/charts/ceph-csi-rbd/Chart.yaml +++ b/charts/ceph-csi-rbd/Chart.yaml @@ -1,10 +1,10 @@ --- apiVersion: v1 -appVersion: canary +appVersion: v2.0.0 description: "Container Storage Interface (CSI) driver, provisioner, snapshotter, and attacher for Ceph RBD" name: ceph-csi-rbd -version: 1.3.0-canary +version: 2.0.0-canary keywords: - ceph - rbd diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index a1bc7e05e7e..f098862a3d7 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -104,7 +104,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: canary + tag: 2.0.0 pullPolicy: IfNotPresent resources: {} diff --git a/deploy.sh b/deploy.sh index f9f49308f63..d54a443b74b 100755 --- a/deploy.sh +++ b/deploy.sh @@ -70,8 +70,8 @@ build_push_images() { done } -if [ "${TRAVIS_BRANCH}" == 'master' ]; then - export ENV_CSI_IMAGE_VERSION='canary' +if [ "${TRAVIS_BRANCH}" == 'release-v2.0' ]; then + export ENV_CSI_IMAGE_VERSION='v2.0.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/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index 1989bd9e80c..01940b365f3 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -84,7 +84,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:v2.0.0 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -128,7 +128,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v2.0.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index 74e685c8f9e..bdb9133ca4b 100644 --- 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:v2.0.0 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -108,7 +108,7 @@ spec: - name: liveness-prometheus securityContext: privileged: true - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v2.0.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 index 0ba1477bf37..7781c93fb6e 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -104,7 +104,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:v2.0.0 args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -143,7 +143,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v2.0.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index eee7fb07a6f..b19895d8957 100644 --- 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:v2.0.0 args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -105,7 +105,7 @@ spec: - name: liveness-prometheus securityContext: privileged: true - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v2.0.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/scripts/minikube.sh b/scripts/minikube.sh index 925e3873b84..a5f43946cb3 100755 --- a/scripts/minikube.sh +++ b/scripts/minikube.sh @@ -116,7 +116,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:v2.0.0 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.0.0 ;; k8s-sidecar) echo "copying the kubernetes sidecar images"