Skip to content

Commit 5e8288b

Browse files
committed
ci: wait for kubevirt crd to be created before creating CR (#4839)
Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
1 parent 16955b0 commit 5e8288b

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

Makefile

+11-5
Original file line numberDiff line numberDiff line change
@@ -327,13 +327,17 @@ define kind_load_kwok_image
327327
$(call kind_load_image,$(1),$(KWOK_IMAGE),1)
328328
endef
329329

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 \
333333
test $$n -eq 60 && exit 1; \
334334
sleep 1; \
335335
n=$$(($$n+1)); \
336336
done
337+
endef
338+
339+
define kubectl_wait_exist_and_ready
340+
$(call kubectl_wait_exist,$(1),$(2),$(3))
337341
kubectl -n $(1) rollout status --timeout=60s $(2) $(3)
338342
endef
339343

@@ -808,11 +812,13 @@ kind-install-kubevirt:
808812
$(call kind_load_image,kube-ovn,$(KUBEVIRT_LAUNCHER_IMAGE),1)
809813

810814
kubectl apply -f "$(KUBEVIRT_OPERATOR_YAML)"
811-
kubectl apply -f "$(KUBEVIRT_CR_YAML)"
812815
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)"
813820
kubectl -n kubevirt patch kubevirt kubevirt --type=merge --patch \
814821
'{"spec":{"configuration":{"developerConfiguration":{"useEmulation":true}},"infra":{"replicas":1}}}'
815-
$(call kubectl_wait_exist_and_ready,kubevirt,deployment,virt-operator)
816822
$(call kubectl_wait_exist_and_ready,kubevirt,deployment,virt-api)
817823
$(call kubectl_wait_exist_and_ready,kubevirt,deployment,virt-controller)
818824
$(call kubectl_wait_exist_and_ready,kubevirt,daemonset,virt-handler)

0 commit comments

Comments
 (0)