From d2cf3f2e783a77f08f762a7f14d396131d60696b Mon Sep 17 00:00:00 2001 From: ty-dc Date: Tue, 10 Sep 2024 10:45:02 +0800 Subject: [PATCH] Optimize setup kind cluster debug log Signed-off-by: ty-dc --- test/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Makefile b/test/Makefile index 73e8de9cc..d1412befd 100644 --- a/test/Makefile +++ b/test/Makefile @@ -226,7 +226,7 @@ setup_kruise: kind load docker-image $${IMAGE} --name $(E2E_CLUSTER_NAME); \ done; \ helm upgrade --install kruise openkruise/kruise --wait --timeout 20m --debug --set manager.image.repository=$(E2E_OPENKRUISE_IMAGE) \ - --kubeconfig $(E2E_KUBECONFIG) || { KIND_CLUSTER_NAME=$(E2E_CLUSTER_NAME) ./scripts/debugEnv.sh $(E2E_KUBECONFIG) "detail" ; exit 1 ; } ; \ + --kubeconfig $(E2E_KUBECONFIG) && { KIND_CLUSTER_NAME=$(E2E_CLUSTER_NAME) ./scripts/debugEnv.sh $(E2E_KUBECONFIG) "detail" "$(E2E_LOG_FILE)" ; exit 1 ; } ; \ .PHONY: setup_spiderpool setup_spiderpool: @@ -382,7 +382,7 @@ setup_spiderpool: -n $(RELEASE_NAMESPACE) \ $${HELM_OPTION} \ $(E2E_HELM_ADDITIONAL_OPTIONS) \ - --kubeconfig $(E2E_KUBECONFIG) || { KIND_CLUSTER_NAME=$(E2E_CLUSTER_NAME) ./scripts/debugEnv.sh $(E2E_KUBECONFIG) "detail" ; exit 1 ; } ; \ + --kubeconfig $(E2E_KUBECONFIG) || { KIND_CLUSTER_NAME=$(E2E_CLUSTER_NAME) ./scripts/debugEnv.sh $(E2E_KUBECONFIG) "detail" "$(E2E_LOG_FILE)" ; exit 1 ; } ; \ if [ "$(INSTALL_SRIOV)" == "true" ] ; then \ echo "label node for sriov operator " ; \ kubectl --kubeconfig $(E2E_KUBECONFIG) get node | sed '1d' | awk '{print $$1}' | xargs -n 1 -i kubectl --kubeconfig $(E2E_KUBECONFIG) label node {} node-role.kubernetes.io/worker="" ; \