Prep for cephcsi v2.0.1 release

Updated Files to push new v2.0.1 release
and also updated the yaml files to refect
the new image tag.

fixes: #855
fixes: #829

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2020-03-18 12:33:09 +05:30 committed by Madhu Rajanna
parent 4ad4cb162b
commit be6318716e
13 changed files with 25 additions and 24 deletions

View File

@ -17,7 +17,7 @@
CONTAINER_CMD?=docker CONTAINER_CMD?=docker
CSI_IMAGE_NAME=$(if $(ENV_CSI_IMAGE_NAME),$(ENV_CSI_IMAGE_NAME),quay.io/cephcsi/cephcsi) 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),v2.0-canary) CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v2.0.1)
CSI_IMAGE=$(CSI_IMAGE_NAME):$(CSI_IMAGE_VERSION) CSI_IMAGE=$(CSI_IMAGE_NAME):$(CSI_IMAGE_VERSION)
$(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION)) $(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION))

View File

@ -91,6 +91,7 @@ in the Kubernetes documentation.
| Ceph CSI Release/Branch | Container image name | Image Tag | | Ceph CSI Release/Branch | Container image name | Image Tag |
| ----------------------- | ---------------------------- | --------- | | ----------------------- | ---------------------------- | --------- |
| Master (Branch) | quay.io/cephcsi/cephcsi | canary | | Master (Branch) | quay.io/cephcsi/cephcsi | canary |
| v2.0.1 (Release) | quay.io/cephcsi/cephcsi | v2.0.1 |
| v2.0.0 (Release) | quay.io/cephcsi/cephcsi | v2.0.0 | | v2.0.0 (Release) | quay.io/cephcsi/cephcsi | v2.0.0 |
| v1.2.2 (Release) | quay.io/cephcsi/cephcsi | v1.2.2 | | v1.2.2 (Release) | quay.io/cephcsi/cephcsi | v1.2.2 |
| v1.2.1 (Release) | quay.io/cephcsi/cephcsi | v1.2.1 | | v1.2.1 (Release) | quay.io/cephcsi/cephcsi | v1.2.1 |

View File

@ -1,10 +1,10 @@
--- ---
apiVersion: v1 apiVersion: v1
appVersion: v2.0-canary appVersion: v2.0.1
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: 2.0-canary version: 2.0.1-canary
keywords: keywords:
- ceph - ceph
- cephfs - cephfs

View File

@ -104,7 +104,7 @@ nodeplugin:
plugin: plugin:
image: image:
repository: quay.io/cephcsi/cephcsi repository: quay.io/cephcsi/cephcsi
tag: v2.0-canary tag: v2.0.1
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
resources: {} resources: {}

View File

@ -1,10 +1,10 @@
--- ---
apiVersion: v1 apiVersion: v1
appVersion: v2.0-canary appVersion: v2.0.1
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: 2.0-canary version: 2.0.1-canary
keywords: keywords:
- ceph - ceph
- rbd - rbd

View File

@ -104,7 +104,7 @@ nodeplugin:
plugin: plugin:
image: image:
repository: quay.io/cephcsi/cephcsi repository: quay.io/cephcsi/cephcsi
tag: v2.0-canary tag: v2.0.1
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
resources: {} resources: {}

View File

@ -71,7 +71,7 @@ build_push_images() {
} }
if [ "${TRAVIS_BRANCH}" == 'release-v2.0' ]; then if [ "${TRAVIS_BRANCH}" == 'release-v2.0' ]; then
export ENV_CSI_IMAGE_VERSION='v2.0-canary' export ENV_CSI_IMAGE_VERSION='v2.0.1'
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

@ -84,7 +84,7 @@ spec:
capabilities: capabilities:
add: ["SYS_ADMIN"] add: ["SYS_ADMIN"]
# for stable functionality replace canary with latest release version # for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:v2.0-canary image: quay.io/cephcsi/cephcsi:v2.0.1
args: args:
- "--nodeid=$(NODE_ID)" - "--nodeid=$(NODE_ID)"
- "--type=cephfs" - "--type=cephfs"
@ -128,7 +128,7 @@ spec:
- name: keys-tmp-dir - name: keys-tmp-dir
mountPath: /tmp/csi/keys mountPath: /tmp/csi/keys
- name: liveness-prometheus - name: liveness-prometheus
image: quay.io/cephcsi/cephcsi:v2.0-canary image: quay.io/cephcsi/cephcsi:v2.0.1
args: args:
- "--type=liveness" - "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)" - "--endpoint=$(CSI_ENDPOINT)"

View File

@ -54,7 +54,7 @@ spec:
add: ["SYS_ADMIN"] add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true allowPrivilegeEscalation: true
# for stable functionality replace canary with latest release version # for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:v2.0-canary image: quay.io/cephcsi/cephcsi:v2.0.1
args: args:
- "--nodeid=$(NODE_ID)" - "--nodeid=$(NODE_ID)"
- "--type=cephfs" - "--type=cephfs"
@ -110,7 +110,7 @@ spec:
- name: liveness-prometheus - name: liveness-prometheus
securityContext: securityContext:
privileged: true privileged: true
image: quay.io/cephcsi/cephcsi:v2.0-canary image: quay.io/cephcsi/cephcsi:v2.0.1
args: args:
- "--type=liveness" - "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)" - "--endpoint=$(CSI_ENDPOINT)"

View File

@ -104,7 +104,7 @@ spec:
capabilities: capabilities:
add: ["SYS_ADMIN"] add: ["SYS_ADMIN"]
# for stable functionality replace canary with latest release version # for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:v2.0-canary image: quay.io/cephcsi/cephcsi:v2.0.1
args: args:
- "--nodeid=$(NODE_ID)" - "--nodeid=$(NODE_ID)"
- "--type=rbd" - "--type=rbd"
@ -143,7 +143,7 @@ spec:
- name: keys-tmp-dir - name: keys-tmp-dir
mountPath: /tmp/csi/keys mountPath: /tmp/csi/keys
- name: liveness-prometheus - name: liveness-prometheus
image: quay.io/cephcsi/cephcsi:v2.0-canary image: quay.io/cephcsi/cephcsi:v2.0.1
args: args:
- "--type=liveness" - "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)" - "--endpoint=$(CSI_ENDPOINT)"

View File

@ -55,7 +55,7 @@ spec:
add: ["SYS_ADMIN"] add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true allowPrivilegeEscalation: true
# for stable functionality replace canary with latest release version # for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:v2.0-canary image: quay.io/cephcsi/cephcsi:v2.0.1
args: args:
- "--nodeid=$(NODE_ID)" - "--nodeid=$(NODE_ID)"
- "--type=rbd" - "--type=rbd"
@ -107,7 +107,7 @@ spec:
- name: liveness-prometheus - name: liveness-prometheus
securityContext: securityContext:
privileged: true privileged: true
image: quay.io/cephcsi/cephcsi:v2.0-canary image: quay.io/cephcsi/cephcsi:v2.0.1
args: args:
- "--type=liveness" - "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)" - "--endpoint=$(CSI_ENDPOINT)"

View File

@ -2,7 +2,7 @@
- [Ceph-csi Upgrade](#ceph-csi-upgrade) - [Ceph-csi Upgrade](#ceph-csi-upgrade)
- [Pre-upgrade considerations](#pre-upgrade-considerations) - [Pre-upgrade considerations](#pre-upgrade-considerations)
- [Upgrading from v1.2.x to v2.0.0](#upgrading-from-v12x-to-v200) - [Upgrading from v1.2.x to v2.0.1](#upgrading-from-v12x-to-v201)
- [Upgrading CephFS](#upgrading-cephfs) - [Upgrading CephFS](#upgrading-cephfs)
- [1. Upgrade CephFS Provisioner resources](#1-upgrade-cephfs-provisioner-resources) - [1. Upgrade CephFS Provisioner resources](#1-upgrade-cephfs-provisioner-resources)
- [1.1 Update the CephFS Provisioner RBAC](#11-update-the-cephfs-provisioner-rbac) - [1.1 Update the CephFS Provisioner RBAC](#11-update-the-cephfs-provisioner-rbac)
@ -44,9 +44,9 @@ To avoid this issue in future upgrades, we recommend that you do not use the
fuse client or rbd-nbd as of now. fuse client or rbd-nbd as of now.
This guide will walk you through the steps to upgrade the software in a cluster This guide will walk you through the steps to upgrade the software in a cluster
from v1.2.x to v2.0.0 from v1.2.x to v2.0.1
## Upgrading from v1.2.x to v2.0.0 ## Upgrading from v1.2.x to v2.0.1
**Ceph-csi releases from master are expressly unsupported.** It is strongly **Ceph-csi releases from master are expressly unsupported.** It is strongly
recommended that you use [official recommended that you use [official
@ -56,11 +56,11 @@ that will not be supported in the official releases. Builds from the master
branch can have functionality changed and even removed at any time without branch can have functionality changed and even removed at any time without
compatibility support and without prior notice. compatibility support and without prior notice.
git checkout release v2.0.0 branch git checkout release v2.0.1 branch
```bash ```bash
[$] git clone https://github.com/ceph/ceph-csi.git [$] git clone https://github.com/ceph/ceph-csi.git
[$] git check v2.0.0 [$] git check v2.0.1
[$] cd ./ceph-csi [$] cd ./ceph-csi
``` ```
@ -186,7 +186,7 @@ For each node:
- The pod deletion causes the pods to be restarted and updated automatically - The pod deletion causes the pods to be restarted and updated automatically
on the node. on the node.
we have successfully upgraded cephfs csi from v1.2.2 to v2.0.0 we have successfully upgraded cephfs csi from v1.2.x to v2.0.1
### Upgrading RBD ### Upgrading RBD
@ -304,7 +304,7 @@ For each node:
- The pod deletion causes the pods to be restarted and updated automatically - The pod deletion causes the pods to be restarted and updated automatically
on the node. on the node.
we have successfully upgraded RBD csi from v1.2.2 to v2.0.0 we have successfully upgraded RBD csi from v1.2.x to v2.0.1
### Handling node reboot hangs due to existing network mounts ### Handling node reboot hangs due to existing network mounts

View File

@ -129,7 +129,7 @@ teardown-rook)
;; ;;
cephcsi) cephcsi)
echo "copying the cephcsi image" echo "copying the cephcsi image"
copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.0-canary "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.0-canary copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.0.1 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.0.1
;; ;;
k8s-sidecar) k8s-sidecar)
echo "copying the kubernetes sidecar images" echo "copying the kubernetes sidecar images"