From fc0fdea940f5942a8442935645235f70ca4e863d Mon Sep 17 00:00:00 2001 From: "tao.yang" Date: Thu, 12 Sep 2024 13:55:18 +0800 Subject: [PATCH] optimizate spiderpool upgrade CI Signed-off-by: tao.yang --- .github/workflows/auto-upgrade-ci.yaml | 1 - Makefile | 2 +- test/Makefile | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/auto-upgrade-ci.yaml b/.github/workflows/auto-upgrade-ci.yaml index 90436a502..925144d79 100644 --- a/.github/workflows/auto-upgrade-ci.yaml +++ b/.github/workflows/auto-upgrade-ci.yaml @@ -315,7 +315,6 @@ jobs: - name: Upgrade to version ${{ needs.get_ref.outputs.new_version }} id: upgrade - continue-on-error: true run: | RESULT=0 make upgrade_e2e_spiderpool -e E2E_CLUSTER_NAME=${{ env.E2E_CLUSTER_NAME }} \ diff --git a/Makefile b/Makefile index 3aea034fa..7677890d7 100644 --- a/Makefile +++ b/Makefile @@ -434,7 +434,7 @@ clean_e2e_spiderpool: .PHONY: upgrade_e2e_spiderpool upgrade_e2e_spiderpool: - $(QUIET) make -C test upgrade_spiderpool + $(QUIET) make -C test helm_upgrade_spiderpool .PHONY: codegen codegen: diff --git a/test/Makefile b/test/Makefile index 73e8de9cc..920068bc6 100644 --- a/test/Makefile +++ b/test/Makefile @@ -418,11 +418,6 @@ uninstall_spiderpool: done ; \ done -.PHONY: upgrade_spiderpool -upgrade_spiderpool: - @echo -e "\033[35m [upgrade spiderpool] \033[0m" - @make helm_upgrade_spiderpool - .PHONY: helm_upgrade_spiderpool helm_upgrade_spiderpool: @echo -e "\033[35m [helm upgrade spiderpool] \033[0m" @@ -443,6 +438,11 @@ helm_upgrade_spiderpool: --set spiderpoolInit.image.repository=$(SPIDERPOOL_CONTROLLER_IMAGE_NAME) \ --set spiderpoolInit.image.tag=$(E2E_SPIDERPOOL_TAG) \ --set multus.multusCNI.uninstall=false " \ + if [ "$(E2E_SPIDERPOOL_ENABLE_SUBNET)" == "true" ] ; then \ + HELM_OPTION+=" --set ipam.spiderSubnet.enable=true " ; \ + else \ + HELM_OPTION+=" --set ipam.spiderSubnet.enable=false " ; \ + fi ; \ ALL_IMAGES=`helm template $(RELEASE_NAME) $(ROOT_DIR)/charts/spiderpool $${HELM_OPTION} | grep ' image: ' | tr -d '"' | awk -F 'image: ' '{print $$2}' | sort | uniq | tr '\n' ' '` ; \ echo "ALL_IMAGES: $${ALL_IMAGES} " ; \ for IMAGE in $${ALL_IMAGES}; do \