Merge pull request rook#14409 from rook/mergify/bp/release-1.14/pr-14408

csi: update csi-addons repo link (backport rook#14408)
denppa · Jul 2, 2024 · ef1859a · ef1859a
2 parents af459c9 + d1889fb
commit ef1859a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 18 deletions.
diff --git 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<namespace> -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
@@ -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
@@ -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"}}'