Replace csi-hostpath-driver with rook-cephfs

We added csi-hostpath-driver as a quick temporary solution until we have cephfs storage. Now that we have it, we can replace it and enjoy reduced start time, in particular with minikube 1.33. To replace csi-hostpath-driver, we have to add cephfs to the volsync development environment. This is slower locally, but faster in the e2e lab. For regional-dr, this is always faster, up to 1.82 time faster in the e2e lab. The main difference is cluster start time - minikube addons are loaded before minikube start returns. Before: 2024-05-12 23:01:42,844 INFO [dr2] Cluster started in 433.20 seconds 2024-05-12 23:02:07,215 INFO [dr1] Cluster started in 457.57 seconds After: 2024-05-12 23:18:13,386 INFO [hub] Cluster started in 71.87 seconds 2024-05-12 23:18:46,943 INFO [dr2] Cluster started in 105.43 seconds Start time before and after this change: | env | local before | local after | lab before | lab after | |--------------|--------------|-------------|------------|-----------| | regional-dr | 636 | 426 | 780 | 427 | | volsync | 261 | 352 | 520 | 395 | Signed-off-by: Nir Soffer <[email protected]>
nirs · May 12, 2024 · 74ba25d · 74ba25d
1 parent 9e25a5f
commit 74ba25d
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/test/addons/volsync/destination/replication-dst.yaml b/test/addons/volsync/destination/replication-dst.yaml
@@ -12,8 +12,8 @@ spec:
     copyMethod: Snapshot
     capacity: 1Gi
     accessModes: [ReadWriteOnce]
-    storageClassName: csi-hostpath-sc
-    volumeSnapshotClassName: csi-hostpath-snapclass
+    storageClassName: rook-cephfs
+    volumeSnapshotClassName: csi-cephfsplugin-snapclass
     moverSecurityContext:
       runAsUser: 10000
       runAsGroup: 10000

diff --git a/test/addons/volsync/source/pvc.yaml b/test/addons/volsync/source/pvc.yaml
@@ -11,7 +11,7 @@ metadata:
     appname: busybox
 spec:
   accessModes: [ReadWriteOnce]
-  storageClassName: csi-hostpath-sc
+  storageClassName: rook-cephfs
   resources:
     requests:
       storage: 1Gi
diff --git a/test/addons/volsync/source/replication-src.yaml b/test/addons/volsync/source/replication-src.yaml
@@ -15,7 +15,7 @@ spec:
     keySecret: volsync-rsync-tls-busybox-dst
     address: volsync-rsync-tls-dst-busybox-dst.busybox.svc.clusterset.local
     copyMethod: Snapshot
-    volumeSnapshotClassName: csi-hostpath-snapclass
+    volumeSnapshotClassName: csi-cephfsplugin-snapclass
     moverSecurityContext:
       runAsUser: 10000
       runAsGroup: 10000

diff --git a/test/envs/regional-dr-hubless.yaml b/test/envs/regional-dr-hubless.yaml
@@ -22,13 +22,13 @@ templates:
     disk_size: "50g"
     addons:
       - volumesnapshots
-      - csi-hostpath-driver
     workers:
       - addons:
           - name: rook-operator
           - name: rook-cluster
           - name: rook-toolbox
           - name: rook-pool
+          - name: rook-cephfs
       - addons:
           - name: csi-addons
           - name: olm

diff --git a/test/envs/regional-dr.yaml b/test/envs/regional-dr.yaml
@@ -21,11 +21,10 @@ templates:
     memory: "6g"
     extra_disks: 1
     disk_size: "50g"
-    addons:
-      - volumesnapshots
-      - csi-hostpath-driver
     feature_gates:
       - StatefulSetAutoDeletePVC=true
+    addons:
+      - volumesnapshots
     workers:
       - addons:
           - name: rook-operator

diff --git a/test/envs/volsync.yaml b/test/envs/volsync.yaml
@@ -10,7 +10,6 @@ templates:
     driver: $vm
     container_runtime: containerd
     network: $network
-    cni: kindnet
     memory: 2g
     workers:
       - addons:
@@ -20,12 +19,17 @@ templates:
     driver: $vm
     container_runtime: containerd
     network: $network
-    cni: kindnet
-    memory: 4g
+    memory: 6g
+    extra_disks: 1
     disk_size: 50g
     addons:
       - volumesnapshots
-      - csi-hostpath-driver
+    workers:
+      - addons:
+          - name: rook-operator
+          - name: rook-cluster
+          - name: rook-toolbox
+          - name: rook-cephfs
 
 profiles:
   - name: hub