@@ -327,13 +327,17 @@ define kind_load_kwok_image
327
327
$(call kind_load_image,$(1 ) ,$(KWOK_IMAGE ) ,1)
328
328
endef
329
329
330
- define kubectl_wait_exist_and_ready
331
- @echo "Waiting for $(2 ) $(1 ) /$(3 ) to exist ..."
332
- @n=0; while ! kubectl -n $(1 ) get $(2 ) -o name | awk -F / '{print $$2}' | grep -q ^$(3 ) $$; do \
330
+ define kubectl_wait_exist
331
+ @echo "Waiting for $(2 ) $(1 ) /$(3 ) to be created ..."
332
+ @n=0; while ! kubectl -n " $(1 ) " get " $(2 ) " -o name | awk -F / '{print $$2}' | grep -q ^$(3 ) $$; do \
333
333
test $$n -eq 60 && exit 1; \
334
334
sleep 1; \
335
335
n=$$(($$n+1 ) ); \
336
336
done
337
+ endef
338
+
339
+ define kubectl_wait_exist_and_ready
340
+ $(call kubectl_wait_exist,$(1 ) ,$(2 ) ,$(3 ) )
337
341
kubectl -n $(1 ) rollout status --timeout=60s $(2 ) $(3 )
338
342
endef
339
343
@@ -808,11 +812,13 @@ kind-install-kubevirt:
808
812
$(call kind_load_image,kube-ovn,$(KUBEVIRT_LAUNCHER_IMAGE ) ,1)
809
813
810
814
kubectl apply -f "$(KUBEVIRT_OPERATOR_YAML)"
811
- kubectl apply -f "$(KUBEVIRT_CR_YAML)"
812
815
kubectl -n kubevirt scale deploy virt-operator --replicas=1
816
+ $(call kubectl_wait_exist_and_ready,kubevirt,deployment,virt-operator)
817
+ $(call kubectl_wait_exist,,crd,kubevirts.kubevirt.io)
818
+
819
+ kubectl apply -f "$(KUBEVIRT_CR_YAML)"
813
820
kubectl -n kubevirt patch kubevirt kubevirt --type=merge --patch \
814
821
'{"spec":{"configuration":{"developerConfiguration":{"useEmulation":true}},"infra":{"replicas":1}}}'
815
- $(call kubectl_wait_exist_and_ready,kubevirt,deployment,virt-operator)
816
822
$(call kubectl_wait_exist_and_ready,kubevirt,deployment,virt-api)
817
823
$(call kubectl_wait_exist_and_ready,kubevirt,deployment,virt-controller)
818
824
$(call kubectl_wait_exist_and_ready,kubevirt,daemonset,virt-handler)
0 commit comments