diff --git a/README.md b/README.md index b05e8e4..ea440d4 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,21 @@ A helper script to run the integration test of Rook and launch arbitrary Rook cluster. -# supported software versions +# supported Rook versions -- rook: v1.13.2 or later -- minikube: v1.6.24 or later +v1.15.2 or later # Usage ## Prerequisite -This programs is only tests in Ubuntu 22.04 environment. +This programs is only tests in Ubuntu 24.04 environment. The following tools should be installed. - kubectl -- minikube -- containerd +- minikube: v1.7.24 or later +- libvirt0 +- qemu-system-x86 There should be scratch devices for OSDs. By default("cluster-test.yaml"), Rook consumes all scratch devices for OSDs. diff --git a/cluster-fini.sh b/cluster-fini.sh index 58d5b12..f907cc1 100755 --- a/cluster-fini.sh +++ b/cluster-fini.sh @@ -7,6 +7,6 @@ kubectl -n rook-ceph patch cephcluster my-cluster --type merge -p '{"spec":{"cle kubectl delete -f $OPERATOR_DIR/toolbox.yaml kubectl delete -f $CLUSTER_CR -sudo rm -rf /var/lib/rook -ls /dev/mapper/ceph-* | xargs -I% -- sudo dmsetup remove % -sudo rm -rf /dev/mapper/ceph-* +minikube ssh -- sudo rm -rf /var/lib/rook +minikube ssh -- bash -c "ls /dev/mapper/ceph-* | xargs -I% -- sudo dmsetup remove %" +minikube ssh -- sudo rm -rf /dev/mapper/ceph-* diff --git a/config.sh b/config.sh index a7e5751..174829b 100644 --- a/config.sh +++ b/config.sh @@ -1,2 +1,2 @@ -export OPERATOR_DIR=deploy/examples -export CLUSTER_CR=samples/cluster-on-host.yaml +export OPERATOR_DIR=/deploy/examples +export CLUSTER_CR=samples/cluster-on-pvc.yaml diff --git a/k8s-cluster-init.sh b/k8s-cluster-init.sh index 1e91143..49fccf0 100755 --- a/k8s-cluster-init.sh +++ b/k8s-cluster-init.sh @@ -2,4 +2,4 @@ . config.sh -minikube start --driver=none --container-runtime=containerd +minikube start --driver=kvm2 --extra-disks 2 diff --git a/samples/cluster-on-host.yaml b/samples/cluster-on-host.yaml index 8c8f43d..47a202b 100644 --- a/samples/cluster-on-host.yaml +++ b/samples/cluster-on-host.yaml @@ -6,7 +6,7 @@ metadata: spec: dataDirHostPath: /var/lib/rook cephVersion: - image: quay.io/ceph/ceph:v18.2.1 + image: quay.io/ceph/ceph:v18.2.4 allowUnsupported: true mon: count: 1 @@ -22,9 +22,9 @@ spec: useAllNodes: false useAllDevices: false nodes: - - name: coffee + - name: minikube devices: - - name: /dev/sdb + - name: /dev/vdb monitoring: enabled: false healthCheck: diff --git a/samples/cluster-on-pvc.yaml b/samples/cluster-on-pvc.yaml index 42e1f77..187be74 100644 --- a/samples/cluster-on-pvc.yaml +++ b/samples/cluster-on-pvc.yaml @@ -20,7 +20,7 @@ spec: persistentVolumeReclaimPolicy: Retain volumeMode: Block local: - path: /dev/sdb + path: /dev/vdb nodeAffinity: required: nodeSelectorTerms: @@ -28,7 +28,7 @@ spec: - key: kubernetes.io/hostname operator: In values: - - coffee # Please change this to your node + - minikube --- apiVersion: ceph.rook.io/v1 kind: CephCluster @@ -41,7 +41,7 @@ spec: count: 1 allowMultiplePerNode: false cephVersion: - image: quay.io/ceph/ceph:v18.2.1 + image: quay.io/ceph/ceph:v18.2.4 allowUnsupported: false skipUpgradeChecks: false continueUpgradeAfterChecksEvenIfNotHealthy: false