X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=cmd%2Fbpa-operator%2Fe2etest%2Fbpa_vm_verifier.sh;h=7c8b4c4a63635649d2357984e4843f5fdee8474d;hb=refs%2Fchanges%2F99%2F4399%2F1;hp=22ebea822ee1ba329bfcc35b83154dcec2eb03c5;hpb=26b1d59aae389c6c56b74e14266ccbbc251db7b1;p=icn.git

diff --git a/cmd/bpa-operator/e2etest/bpa_vm_verifier.sh b/cmd/bpa-operator/e2etest/bpa_vm_verifier.sh
index 22ebea8..7c8b4c4 100755
--- a/cmd/bpa-operator/e2etest/bpa_vm_verifier.sh
+++ b/cmd/bpa-operator/e2etest/bpa_vm_verifier.sh
@@ -2,6 +2,7 @@
 set -eu -o pipefail
 
 CLUSTER_NAME=cluster-test
+ADDONS_NAMESPACE=kud
 NUM_MASTERS=${NUM_MASTERS:-"1"}
 NUM_WORKERS=${NUM_WORKERS:-"1"}
 
@@ -136,7 +137,7 @@ function emcoctl_apply {
     until [[ $(/opt/kud/multi-cluster/${CLUSTER_NAME}/artifacts/emcoctl.sh apply -f $@ -v values.yaml  |
                    awk '/Response Code:/ {code=$3} END{print code}') =~ 2.. ]]; do
         if [[ $try -lt 10 ]]; then
-            echo "Waiting for KUD addons to terminate"
+            echo "Waiting for KUD addons to instantiate"
             sleep 1s
         else
             return 1
@@ -165,7 +166,7 @@ function wait_for_addons_ready {
     for try in {0..9}; do
 	printf "Waiting for KUD addons to be ready\n"
 	sleep 30s
-	if KUBECONFIG=${CLUSTER_KUBECONFIG} kubectl wait pod -l app.kubernetes.io/instance=r1 --for=condition=Ready --all-namespaces --timeout=0s 2>/dev/null >/dev/null; then
+	if KUBECONFIG=${CLUSTER_KUBECONFIG} kubectl -n ${ADDONS_NAMESPACE} wait pod -l app.kubernetes.io/instance=r1 --for=condition=Ready --timeout=0s 2>/dev/null >/dev/null; then
             status="Ready"
             break
 	fi
@@ -187,8 +188,8 @@ wait_for_addons_ready
 # The issue is kubevirt creates a PodDisruptionBudget that prevents
 # sriov from succesfully draining the node.  The workaround is to
 # temporarily scale down the kubevirt operator while the drain occurs.
-KUBEVIRT_OP_REPLICAS=$(KUBECONFIG=${CLUSTER_KUBECONFIG} kubectl get deployments/r1-kubevirt-operator -o jsonpath='{.spec.replicas}')
-KUBECONFIG=${CLUSTER_KUBECONFIG} kubectl scale deployments/r1-kubevirt-operator --replicas=0
+KUBEVIRT_OP_REPLICAS=$(KUBECONFIG=${CLUSTER_KUBECONFIG} kubectl -n ${ADDONS_NAMESPACE} get deployments/r1-kubevirt-operator -o jsonpath='{.spec.replicas}')
+KUBECONFIG=${CLUSTER_KUBECONFIG} kubectl -n ${ADDONS_NAMESPACE} scale deployments/r1-kubevirt-operator --replicas=0
 
 #Install addon resources
 printf "Installing KUD addon resources\n"
@@ -201,7 +202,7 @@ wait_for_addons_ready
 # Scale the kubevirt operator back up and wait things to be ready
 # again.
 KUBECONFIG=${CLUSTER_KUBECONFIG} kubectl wait nodes --for=condition=Ready --all
-KUBECONFIG=${CLUSTER_KUBECONFIG} kubectl scale deployments/r1-kubevirt-operator --replicas=${KUBEVIRT_OP_REPLICAS}
+KUBECONFIG=${CLUSTER_KUBECONFIG} kubectl -n ${ADDONS_NAMESPACE} scale deployments/r1-kubevirt-operator --replicas=${KUBEVIRT_OP_REPLICAS}
 wait_for_addons_ready
 
 #Test addons