From d1889fb5c18d7593d30fd3ddb78ec3b98220537d Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Tue, 2 Jul 2024 17:36:24 +0200 Subject: [PATCH] csi: update csi-addons repo link updating csi-addons repo link to pull the yamls for installation closes: #14394 Signed-off-by: Madhu Rajanna (cherry picked from commit 266fd49c0293f97ee2d7df48134a283b4e5e8820) --- .../Block-Storage-RBD/block-storage.md | 13 +------------ .../Ceph-CSI/ceph-csi-drivers.md | 6 +++--- tests/scripts/csiaddons.sh | 6 +++--- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/Documentation/Storage-Configuration/Block-Storage-RBD/block-storage.md b/Documentation/Storage-Configuration/Block-Storage-RBD/block-storage.md index 5ce95ead3c4d..7b311479b88b 100644 --- a/Documentation/Storage-Configuration/Block-Storage-RBD/block-storage.md +++ b/Documentation/Storage-Configuration/Block-Storage-RBD/block-storage.md @@ -201,19 +201,8 @@ If a node goes down where a pod is running where a RBD RWO volume is mounted, th ### Configure CSI-Addons -Deploy the csi-addons manifests: +Deploy csi-addons controller and enable `csi-addons` sidecar as mentioned in the [CSI Addons](../Ceph-CSI/ceph-csi-drivers#CSI-Addons-Controller) guide. -```console -kubectl create -f https://raw.githubusercontent.com/csi-addons/kubernetes-csi-addons/v0.8.0/deploy/controller/crds.yaml -kubectl create -f https://raw.githubusercontent.com/csi-addons/kubernetes-csi-addons/v0.8.0/deploy/controller/rbac.yaml -kubectl create -f https://raw.githubusercontent.com/csi-addons/kubernetes-csi-addons/v0.8.0/deploy/controller/setup-controller.yaml -``` - -Enable the `csi-addons` sidecar in the Rook operator configuration. - -```console -kubectl patch cm rook-ceph-operator-config -n -p $'data:\n "CSI_ENABLE_CSIADDONS": "true"' -``` ### Handling Node Loss diff --git a/Documentation/Storage-Configuration/Ceph-CSI/ceph-csi-drivers.md b/Documentation/Storage-Configuration/Ceph-CSI/ceph-csi-drivers.md index 87f8021905e5..2251e3d8c112 100644 --- a/Documentation/Storage-Configuration/Ceph-CSI/ceph-csi-drivers.md +++ b/Documentation/Storage-Configuration/Ceph-CSI/ceph-csi-drivers.md @@ -166,9 +166,9 @@ that the controller inspects and forwards to one or more CSI-Addons sidecars for Deploy the controller by running the following commands: ```console -kubectl create -f https://raw.githubusercontent.com/csi-addons/kubernetes-csi-addons/v0.8.0/deploy/controller/crds.yaml -kubectl create -f https://raw.githubusercontent.com/csi-addons/kubernetes-csi-addons/v0.8.0/deploy/controller/rbac.yaml -kubectl create -f https://raw.githubusercontent.com/csi-addons/kubernetes-csi-addons/v0.8.0/deploy/controller/setup-controller.yaml +kubectl create -f https://github.com/csi-addons/kubernetes-csi-addons/releases/download/v0.8.0/crds.yaml +kubectl create -f https://github.com/csi-addons/kubernetes-csi-addons/releases/download/v0.8.0/rbac.yaml +kubectl create -f https://github.com/csi-addons/kubernetes-csi-addons/releases/download/v0.8.0/setup-controller.yaml ``` This creates the required CRDs and configures permissions. diff --git a/tests/scripts/csiaddons.sh b/tests/scripts/csiaddons.sh index 67845c6d8da0..b3ebb9f845f8 100755 --- a/tests/scripts/csiaddons.sh +++ b/tests/scripts/csiaddons.sh @@ -24,9 +24,9 @@ function setup_csiaddons() { echo "setting up csi-addons" echo "deploying controller" - kubectl create -f https://raw.githubusercontent.com/csi-addons/kubernetes-csi-addons/$CSIADDONS_VERSION/deploy/controller/crds.yaml - kubectl create -f https://raw.githubusercontent.com/csi-addons/kubernetes-csi-addons/$CSIADDONS_VERSION/deploy/controller/rbac.yaml - kubectl create -f https://raw.githubusercontent.com/csi-addons/kubernetes-csi-addons/$CSIADDONS_VERSION/deploy/controller/setup-controller.yaml + kubectl create -f https://github.com/csi-addons/kubernetes-csi-addons/releases/download/$CSIADDONS_VERSION/crds.yaml + kubectl create -f https://github.com/csi-addons/kubernetes-csi-addons/releases/download/$CSIADDONS_VERSION/rbac.yaml + kubectl create -f https://github.com/csi-addons/kubernetes-csi-addons/releases/download/$CSIADDONS_VERSION/setup-controller.yaml echo "enabling csi-addons" kubectl patch cm rook-ceph-operator-config -n rook-ceph --type merge -p '{"data":{"CSI_ENABLE_CSIADDONS":"true"}}'