From 4ec49403803574f375ac3e3349ec2974b6a2da85 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Wed, 13 Sep 2023 10:27:56 +0200 Subject: [PATCH 1/2] doc: remove support matrix for Snapshot As Beta CRD is not supported and also mentioned kubernetes versions are also not supported anymore, Removing the details from the doc for the same reason. Signed-off-by: Madhu Rajanna --- docs/ceph-csi-upgrade.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/docs/ceph-csi-upgrade.md b/docs/ceph-csi-upgrade.md index 68e675150b7..4c7b0fc4974 100644 --- a/docs/ceph-csi-upgrade.md +++ b/docs/ceph-csi-upgrade.md @@ -3,7 +3,6 @@ - [Ceph-csi Upgrade](#ceph-csi-upgrade) - [Pre-upgrade considerations](#pre-upgrade-considerations) - [Snapshot-controller and snapshot crd](#snapshot-controller-and-snapshot-crd) - - [Snapshot API version support matrix](#snapshot-api-version-support-matrix) - [Upgrading from previous releases](#upgrading-from-previous-releases) - [Upgrading from v3.8 to v3.9](#upgrading-from-v38-to-v39) - [Upgrading CephFS](#upgrading-cephfs) @@ -61,13 +60,6 @@ Its kubernetes distributor responsibility to install new snapshot controller and snapshot CRD. more info can be found [here](https://github.com/kubernetes-csi/external-snapshotter/tree/master#usage) -#### 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 | - **Note:** We recommend to use {sidecar, controller, crds} of same version ## Upgrading from previous releases From 1e8fd40f1f4f4fd09794ba4834cb8623d0ec04b6 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Wed, 13 Sep 2023 10:29:29 +0200 Subject: [PATCH 2/2] doc: remove unwanted PSP and clusterrole There are few PSP and clusterrole which does not exists anymore in cephcsi, removing it from the upgrade doc for the same reason. Signed-off-by: Madhu Rajanna --- docs/ceph-csi-upgrade.md | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/docs/ceph-csi-upgrade.md b/docs/ceph-csi-upgrade.md index 4c7b0fc4974..ba06865b6c8 100644 --- a/docs/ceph-csi-upgrade.md +++ b/docs/ceph-csi-upgrade.md @@ -14,7 +14,6 @@ - [2.2 Update the CephFS Nodeplugin daemonset](#22-update-the-cephfs-nodeplugin-daemonset) - [2.3 Manual deletion of CephFS Nodeplugin daemonset pods](#23-manual-deletion-of-cephfs-nodeplugin-daemonset-pods) - [2.4 Modifying MountOptions in Storageclass and PersistentVolumes](#24-modifying-mountoptions-in-storageclass-and-persistentvolumes) - - [Delete removed CephFS PSP, Role and RoleBinding](#delete-removed-cephfs-psp-role-and-rolebinding) - [Upgrading RBD](#upgrading-rbd) - [3. Upgrade RBD Provisioner resources](#3-upgrade-rbd-provisioner-resources) - [3.1 Update the RBD Provisioner RBAC](#31-update-the-rbd-provisioner-rbac) @@ -22,7 +21,6 @@ - [4. Upgrade RBD Nodeplugin resources](#4-upgrade-rbd-nodeplugin-resources) - [4.1 Update the RBD Nodeplugin RBAC](#41-update-the-rbd-nodeplugin-rbac) - [4.2 Update the RBD Nodeplugin daemonset](#42-update-the-rbd-nodeplugin-daemonset) - - [Delete removed RBD PSP, Role and RoleBinding](#delete-removed-rbd-psp-role-and-rolebinding) - [Upgrading NFS](#upgrading-nfs) - [5. Upgrade NFS Provisioner resources](#5-upgrade-nfs-provisioner-resources) - [5.1 Update the NFS Provisioner RBAC](#51-update-the-nfs-provisioner-rbac) @@ -247,20 +245,6 @@ Follow the below steps to update the PersistentVolume's `MountOptions`: - and remove invalid mount options from `MountOptions` field in the PersistentVolume's using `kubectl edit pv `. -#### Delete removed CephFS PSP, Role and RoleBinding - -As PSP is deprecated in Kubernetes v1.21.0. Delete PSP related objects as PSP -support for CephFS is removed. - -```console -kubectl delete psp cephfs-csi-provisioner-psp --ignore-not-found -kubectl delete role cephfs-csi-provisioner-psp --ignore-not-found -kubectl delete rolebinding cephfs-csi-provisioner-psp --ignore-not-found -kubectl delete psp cephfs-csi-nodeplugin-psp --ignore-not-found -kubectl delete role cephfs-csi-nodeplugin-psp --ignore-not-found -kubectl delete rolebinding cephfs-csi-nodeplugin-psp --ignore-not-found -``` - we have successfully upgraded cephfs csi from v3.8 to v3.9 ### Upgrading RBD @@ -280,7 +264,6 @@ Provisioner deployment $ kubectl apply -f deploy/rbd/kubernetes/csi-provisioner-rbac.yaml serviceaccount/rbd-csi-provisioner configured clusterrole.rbac.authorization.k8s.io/rbd-external-provisioner-runner configured -clusterrole.rbac.authorization.k8s.io/rbd-external-provisioner-runner-rules configured clusterrolebinding.rbac.authorization.k8s.io/rbd-csi-provisioner-role configured role.rbac.authorization.k8s.io/rbd-external-provisioner-cfg configured rolebinding.rbac.authorization.k8s.io/rbd-csi-provisioner-role-cfg configured @@ -315,7 +298,6 @@ nodeplugin daemonset $ kubectl apply -f deploy/rbd/kubernetes/csi-nodeplugin-rbac.yaml serviceaccount/rbd-csi-nodeplugin configured clusterrole.rbac.authorization.k8s.io/rbd-csi-nodeplugin configured -clusterrole.rbac.authorization.k8s.io/rbd-csi-nodeplugin-rules configured clusterrolebinding.rbac.authorization.k8s.io/rbd-csi-nodeplugin configured ``` @@ -327,23 +309,6 @@ daemonset.apps/csi-rbdplugin configured service/csi-metrics-rbdplugin configured ``` -#### Delete removed RBD PSP, Role and RoleBinding - -As PSP is deprecated in Kubernetes v1.21.0. Delete PSP related objects as PSP -support for RBD is removed. - -```console -kubectl delete psp rbd-csi-provisioner-psp --ignore-not-found -kubectl delete role rbd-csi-provisioner-psp --ignore-not-found -kubectl delete rolebinding rbd-csi-provisioner-psp --ignore-not-found -kubectl delete psp rbd-csi-nodeplugin-psp --ignore-not-found -kubectl delete role rbd-csi-nodeplugin-psp --ignore-not-found -kubectl delete rolebinding rbd-csi-nodeplugin-psp --ignore-not-found -kubectl delete psp rbd-csi-vault-token-review-psp --ignore-not-found -kubectl delete role rbd-csi-vault-token-review-psp --ignore-not-found -kubectl delete rolebinding rbd-csi-vault-token-review-psp --ignore-not-found -``` - we have successfully upgraded RBD csi from v3.8 to v3.9 ### Upgrading NFS