From 80fb9198f5edf7ab52f02a3f04a72b1f9a82e190 Mon Sep 17 00:00:00 2001 From: Elena Gershkovich Date: Wed, 18 Sep 2024 14:24:50 +0300 Subject: [PATCH] Adjust drenv to support consistency groups Signed-off-by: Elena Gershkovich --- test/addons/rbd-mirror/start | 12 ++++++++++++ test/addons/rbd-mirror/vgr-sample.yaml | 17 +++++++++++++++++ test/addons/rbd-mirror/vgrc-sample.yaml | 14 ++++++++++++++ test/addons/rook-pool/storage-class.yaml | 2 ++ 4 files changed, 45 insertions(+) create mode 100644 test/addons/rbd-mirror/vgr-sample.yaml create mode 100644 test/addons/rbd-mirror/vgrc-sample.yaml diff --git a/test/addons/rbd-mirror/start b/test/addons/rbd-mirror/start index c21d4cafc..7d77d29d9 100755 --- a/test/addons/rbd-mirror/start +++ b/test/addons/rbd-mirror/start @@ -231,6 +231,15 @@ def deploy_vrc_sample(cluster): ) +def deploy_vgrc_sample(cluster): + print(f"Applying vgrc sample in cluster '{cluster}'") + kubectl.apply( + "--filename=vgrc-sample.yaml", + "--namespace=rook-ceph", + context=cluster, + ) + + if len(sys.argv) != 3: print(f"Usage: {sys.argv[0]} cluster1 cluster2") sys.exit(1) @@ -268,4 +277,7 @@ wait_until_pool_mirroring_is_healthy(cluster2) deploy_vrc_sample(cluster1) deploy_vrc_sample(cluster2) +deploy_vgrc_sample(cluster1) +deploy_vgrc_sample(cluster2) + print("Mirroring was setup successfully") diff --git a/test/addons/rbd-mirror/vgr-sample.yaml b/test/addons/rbd-mirror/vgr-sample.yaml new file mode 100644 index 000000000..0a927ccfc --- /dev/null +++ b/test/addons/rbd-mirror/vgr-sample.yaml @@ -0,0 +1,17 @@ +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + +--- +apiVersion: replication.storage.openshift.io/v1alpha1 +kind: VolumeGroupReplication +metadata: + name: vgr-sample +spec: + volumeGroupReplicationClassName: vgrc-sample + replicationState: primary + source: + selector: + matchLabels: + appname: busybox + ramendr.openshift.io/consistency-group: rook-ceph-storage-id + autoResync: true diff --git a/test/addons/rbd-mirror/vgrc-sample.yaml b/test/addons/rbd-mirror/vgrc-sample.yaml new file mode 100644 index 000000000..e4eae360d --- /dev/null +++ b/test/addons/rbd-mirror/vgrc-sample.yaml @@ -0,0 +1,14 @@ +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + +--- +apiVersion: replication.storage.openshift.io/v1alpha1 +kind: VolumeGroupReplicationClass +metadata: + name: vgrc-sample +spec: + provisioner: rook-ceph.rbd.csi.ceph.com + parameters: + replication.storage.openshift.io/replication-secret-name: rook-csi-rbd-provisioner + replication.storage.openshift.io/replication-secret-namespace: rook-ceph + schedulingInterval: 1m diff --git a/test/addons/rook-pool/storage-class.yaml b/test/addons/rook-pool/storage-class.yaml index 77ec8cc6b..389fe2378 100644 --- a/test/addons/rook-pool/storage-class.yaml +++ b/test/addons/rook-pool/storage-class.yaml @@ -6,6 +6,8 @@ apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: name: rook-ceph-block + labels: + ramendr.openshift.io/storageid: rook-ceph-storage-id provisioner: rook-ceph.rbd.csi.ceph.com parameters: clusterID: rook-ceph