Use unambiguous resource for CAPI cluster objects (#153)

nephio-project · Jun 30, 2023 · 032c84e · 032c84e
1 parent 51531e4
commit 032c84e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/e2e/tests/001.sh b/e2e/tests/001.sh
@@ -38,5 +38,5 @@ k8s_wait_exists "$kubeconfig" 600 "default" "packagerev" "$regional_pkg_rev"
 kpt alpha rpkg approve -n default "$regional_pkg_rev"
 
 k8s_wait_exists "$kubeconfig" 600 "default" "workloadcluster" "regional"
-k8s_wait_exists "$kubeconfig" 600 "default" "cluster" "regional"
-k8s_wait_ready "$kubeconfig" 600 "default" "cluster" "regional"
+k8s_wait_exists "$kubeconfig" 600 "default" "cl" "regional"
+k8s_wait_ready "$kubeconfig" 600 "default" "cl" "regional"
diff --git a/e2e/tests/002.sh b/e2e/tests/002.sh
@@ -32,12 +32,12 @@ k8s_apply "$kubeconfig" "$TESTDIR/002-edge-clusters.yaml"
 # Wait for cluster resources creation
 for cluster in edge01 edge02; do
     k8s_wait_exists "$kubeconfig" 600 "default" "workloadcluster" "$cluster"
-    k8s_wait_exists "$kubeconfig" 600 "default" "cluster" "$cluster"
+    k8s_wait_exists "$kubeconfig" 600 "default" "cl" "$cluster"
 done
 
 # Wait for cluster readiness
-for cluster in $(kubectl get cluster -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' --kubeconfig "$kubeconfig"); do
-    k8s_wait_ready "$kubeconfig" 600 "default" "cluster" "$cluster"
+for cluster in $(kubectl get cl -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' --kubeconfig "$kubeconfig"); do
+    k8s_wait_ready "$kubeconfig" 600 "default" "cl" "$cluster"
     for machineset in $(kubectl get machineset -l cluster.x-k8s.io/cluster-name="$cluster" -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' --kubeconfig "$kubeconfig"); do
         k8s_wait_ready "$kubeconfig" 600 "default" "machineset" "$machineset"
     done