Merge pull request #237 from ty-dc/fix/upgrade-nighty-ci

optimizate spiderpool upgrade CI

.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 }} \

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:

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 \