Merge pull request #223 from red-hat-storage/sync_us--main

Syncing latest changes from upstream main for ramen
red-hat-storage · Mar 27, 2024 · 65380af · 65380af
2 parents 8600439 + 930463d
commit 65380af
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/test/addons/cdi/cr/kustomization.yaml b/test/addons/cdi/cr/kustomization.yaml
@@ -4,7 +4,7 @@
 # yamllint disable rule:line-length
 ---
 resources:
-  - https://raw.githubusercontent.com/nirs/drenv-addons/main/cdi/dabbcbed1618d1ec970135b4c0a8b692c2dd60b6/cdi-cr.yaml
+  - https://github.com/kubevirt/containerized-data-importer/releases/download/v1.58.3/cdi-cr.yaml
 patches:
   # Allow pulling from local insecure registry.
   - target:

diff --git a/test/addons/cdi/operator/kustomization.yaml b/test/addons/cdi/operator/kustomization.yaml
@@ -4,5 +4,4 @@
 # yamllint disable rule:line-length
 ---
 resources:
-  # TODO: use latest release.
-  - https://raw.githubusercontent.com/nirs/drenv-addons/main/cdi/dabbcbed1618d1ec970135b4c0a8b692c2dd60b6/cdi-operator.yaml
+  - https://github.com/kubevirt/containerized-data-importer/releases/download/v1.58.3/cdi-operator.yaml
diff --git a/test/addons/rbd-mirror/start b/test/addons/rbd-mirror/start
@@ -41,12 +41,11 @@ def fetch_secret_info(cluster):
     info = {}
 
     print(f"Getting mirroring info site name for cluster '{cluster}'")
-    info["name"] = kubectl.get(
-        "cephblockpools.ceph.rook.io",
-        POOL_NAME,
-        "--output=jsonpath={.status.mirroringInfo.site_name}",
-        "--namespace=rook-ceph",
-        context=cluster,
+    info["name"] = drenv.wait_for(
+        f"cephblockpools.ceph.rook.io/{POOL_NAME}",
+        output="jsonpath={.status.mirroringInfo.site_name}",
+        namespace="rook-ceph",
+        profile=cluster,
     )
 
     print(f"Getting rbd mirror boostrap peer secret name for cluster '{cluster}'")