build: update required files for release-v3.3

updated the required templates and upgrade
document for release 3.3

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2021-04-14 12:46:33 +05:30 committed by Humble Devassy Chirammal
parent eea52847bc
commit 8122750c58
13 changed files with 36 additions and 29 deletions

View File

@ -15,7 +15,7 @@ services:
language: go
branches:
only:
- devel
- release-v3.3
# Only run the deploy stage on push (not pull_request) events.
stages:
- name: deploy

View File

@ -9,7 +9,7 @@
# get proporly expanded.
#
# cephcsi image version
CSI_IMAGE_VERSION=canary
CSI_IMAGE_VERSION=v3.3.0
# Ceph version to use
BASE_IMAGE=docker.io/ceph/ceph:v15

View File

@ -1,10 +1,10 @@
---
apiVersion: v1
appVersion: canary
appVersion: v3.3.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.3.0-canary
keywords:
- ceph
- cephfs

View File

@ -84,7 +84,7 @@ nodeplugin:
plugin:
image:
repository: quay.io/cephcsi/cephcsi
tag: canary
tag: v3.3.0
pullPolicy: IfNotPresent
resources: {}

View File

@ -1,10 +1,10 @@
---
apiVersion: v1
appVersion: canary
appVersion: v3.3.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.3.0-canary
keywords:
- ceph
- rbd

View File

@ -95,7 +95,7 @@ nodeplugin:
plugin:
image:
repository: quay.io/cephcsi/cephcsi
tag: canary
tag: v3.3.0
pullPolicy: IfNotPresent
resources: {}

View File

@ -83,7 +83,7 @@ build_push_images() {
make push-manifest
}
if [ "${TRAVIS_BRANCH}" != 'devel' ]; then
if [ "${TRAVIS_BRANCH}" != 'release-v3.3' ]; then
echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting"
exit 0 # Exiting 0 so that this isn't marked as failing
fi

View File

@ -111,7 +111,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.3.0
args:
- "--nodeid=$(NODE_ID)"
- "--type=cephfs"
@ -147,7 +147,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.3.0
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"

View File

@ -47,7 +47,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.3.0
args:
- "--nodeid=$(NODE_ID)"
- "--type=cephfs"
@ -97,7 +97,7 @@ spec:
- name: liveness-prometheus
securityContext:
privileged: true
image: quay.io/cephcsi/cephcsi:canary
image: quay.io/cephcsi/cephcsi:v3.3.0
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"

View File

@ -114,7 +114,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.3.0
args:
- "--nodeid=$(NODE_ID)"
- "--type=rbd"
@ -165,7 +165,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.3.0
args:
- "--type=controller"
- "--v=5"
@ -183,7 +183,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.3.0
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"

View File

@ -48,7 +48,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.3.0
args:
- "--nodeid=$(NODE_ID)"
- "--type=rbd"
@ -106,7 +106,7 @@ spec:
- name: liveness-prometheus
securityContext:
privileged: true
image: quay.io/cephcsi/cephcsi:canary
image: quay.io/cephcsi/cephcsi:v3.3.0
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"

View File

@ -2,12 +2,14 @@
- [Ceph-csi Upgrade](#ceph-csi-upgrade)
- [Pre-upgrade considerations](#pre-upgrade-considerations)
- [snapshot-controller and snapshot CRD](#snapshot-controller-and-snapshot-crd)
- [Snapshot-controller and snapshot crd](#snapshot-controller-and-snapshot-crd)
- [Snapshot API version support matrix](#snapshot-api-version-support-matrix)
- [Upgrading from v1.2 to v2.0](#upgrading-from-v12-to-v20)
- [Upgrading from v2.0 to v2.1](#upgrading-from-v20-to-v21)
- [Upgrading from v2.1 to v3.0](#upgrading-from-v21-to-v30)
- [Upgrading from v3.0 to v3.1](#upgrading-from-v30-to-v31)
- [Upgrading from v3.1 to v3.2](#upgrading-from-v31-to-v32)
- [Upgrading from v3.2 to v3.3](#upgrading-from-v32-to-v33)
- [Upgrading CephFS](#upgrading-cephfs)
- [1. Upgrade CephFS Provisioner resources](#1-upgrade-cephfs-provisioner-resources)
- [1.1 Update the CephFS Provisioner RBAC](#11-update-the-cephfs-provisioner-rbac)
@ -61,7 +63,7 @@ controller and snapshot CRD. more info can be found
#### Snapshot API version support matrix
| Snapshot API version | Kubernetes Version | Snapshot-Controller + CRDs Version | Sidecar Version |
| -------------------- | -------------------- | ---------------------------------- | ---------------------- |
| -------------------- | -------------------- | ---------------------------------- | --------------- |
| v1beta1 | v1.17 =< k8s < v1.20 | v2.x =< snapshot-controller < v4.x | sidecar >= v2.x |
| v1 | k8s >= v1.20 | snapshot-controller >= v4.x | sidecar >= v2.x |
@ -92,6 +94,11 @@ to upgrade from cephcsi v3.0 to v3.1
## Upgrading from v3.1 to v3.2
Refer [upgrade-from-v3.1-v3.2](https://github.com/ceph/ceph-csi/blob/v3.2.1/docs/ceph-csi-upgrade.md)
to upgrade from cephcsi v3.1 to v3.2
## Upgrading from v3.2 to v3.3
**Ceph-csi releases from devel are expressly unsupported.** It is strongly
recommended that you use [official
releases](https://github.com/ceph/ceph-csi/releases) of Ceph-csi. Unreleased
@ -100,12 +107,12 @@ that will not be supported in the official releases. Builds from the devel
branch can have functionality changed and even removed at any time without
compatibility support and without prior notice.
git checkout v3.2.0 tag
git checkout v3.3.0 tag
```bash
git clone https://github.com/ceph/ceph-csi.git
cd ./ceph-csi
git checkout v3.2.0
git checkout v3.3.0
```
**Note:** While upgrading please Ignore warning messages from kubectl output
@ -230,7 +237,7 @@ For each node:
- The pod deletion causes the pods to be restarted and updated automatically
on the node.
we have successfully upgraded cephfs csi from v3.0 to v3.1
we have successfully upgraded cephfs csi from v3.2 to v3.3
### Upgrading RBD
@ -348,7 +355,7 @@ For each node:
- The pod deletion causes the pods to be restarted and updated automatically
on the node.
we have successfully upgraded RBD csi from v3.1 to v3.2
we have successfully upgraded RBD csi from v3.2 to v3.3
### Handling node reboot hangs due to existing network mounts
@ -364,7 +371,7 @@ the mountpoints.
### CSI Sidecar containers consideration
With 3.2.0 version of ceph-csi we have updated the versions of CSI sidecar
With 3.3.0 version of ceph-csi we have updated the versions of CSI sidecar
containers. These versions are generally compatible with kubernetes
version>=1.17 but based on the kubernetes version you are using, you need to
update the templates with required sidecar versions.

View File

@ -281,7 +281,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.3.0 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v3.3.0
;;
k8s-sidecar)
echo "copying the kubernetes sidecar images"