CI: Retry update resources with the conflict error (#4843)

Signed-off-by: Cyclinder Kuo <[email protected]>

Author: cyclinder

.github/workflows/auto-nightly-ci.yaml

@@ -175,17 +175,19 @@ jobs:
       e2e_labels: ${{ needs.get_ref.outputs.e2e_labels }}
     secrets: inherit
 
-  call_low_kernel:
-    needs: [call_build_ci_image, get_ref, call_release_chart]
-    if: ${{ needs.get_ref.outputs.e2e_enabled == 'true' && needs.get_ref.outputs.ipfamily_dual_e2e == 'true' }}
-    uses: ./.github/workflows/e2e-init.yaml
-    with:
-      os: ubuntu-20.04
-      ip_family: dual
-      image_tag: ${{ needs.call_build_ci_image.outputs.imageTag }}
-      ref: ${{ needs.get_ref.outputs.ref }}
-      e2e_labels: ${{ needs.get_ref.outputs.e2e_labels }}
-    secrets: inherit
+  # This is a scheduled Ubuntu 20.04 retirement. Ubuntu 20.04 LTS runner will be removed on 2025-04-15.
+  # For more details, see https://github.com/actions/runner-images/issues/11101Show less
+  # call_low_kernel:
+  #   needs: [call_build_ci_image, get_ref, call_release_chart]
+  #   if: ${{ needs.get_ref.outputs.e2e_enabled == 'true' && needs.get_ref.outputs.ipfamily_dual_e2e == 'true' }}
+  #   uses: ./.github/workflows/e2e-init.yaml
+  #   with:
+  #     os: ubuntu-22.04
+  #     ip_family: dual
+  #     image_tag: ${{ needs.call_build_ci_image.outputs.imageTag }}
+  #     ref: ${{ needs.get_ref.outputs.ref }}
+  #     e2e_labels: ${{ needs.get_ref.outputs.e2e_labels }}
+  #   secrets: inherit
 
   creat_issue:
     runs-on: ubuntu-latest

.github/workflows/auto-pr-ci.yaml

@@ -241,17 +241,19 @@ jobs:
       e2e_labels: ${{ needs.get_ref.outputs.e2e_labels }}
     secrets: inherit
 
-  e2e_dual_ubuntu_20:
-    needs: [call_build_ci_image, get_ref, call_release_chart]
-    if: ${{ needs.get_ref.outputs.e2e_enabled == 'true' && needs.get_ref.outputs.ipfamily_dual_e2e == 'true' }}
-    uses: ./.github/workflows/e2e-init.yaml
-    with:
-      os: ubuntu-20.04
-      ip_family: dual
-      image_tag: ${{ needs.call_build_ci_image.outputs.imageTag }}
-      ref: ${{ needs.get_ref.outputs.ref }}
-      e2e_labels: ${{ needs.get_ref.outputs.e2e_labels }}
-    secrets: inherit
+  # This is a scheduled Ubuntu 20.04 retirement. Ubuntu 20.04 LTS runner will be removed on 2025-04-15.
+  # For more details, see https://github.com/actions/runner-images/issues/11101Show less
+  # e2e_dual_ubuntu_20:
+  #   needs: [call_build_ci_image, get_ref, call_release_chart]
+  #   if: ${{ needs.get_ref.outputs.e2e_enabled == 'true' && needs.get_ref.outputs.ipfamily_dual_e2e == 'true' }}
+  #   uses: ./.github/workflows/e2e-init.yaml
+  #   with:
+  #     os: ubuntu-20.04
+  #     ip_family: dual
+  #     image_tag: ${{ needs.call_build_ci_image.outputs.imageTag }}
+  #     ref: ${{ needs.get_ref.outputs.ref }}
+  #     e2e_labels: ${{ needs.get_ref.outputs.e2e_labels }}
+  #   secrets: inherit
 
   e2e_dual_k8s_12:
     needs: [call_build_ci_image, get_ref, call_release_chart]

test/e2e/annotation/annotation_test.go

@@ -22,6 +22,7 @@ import (
 	pkgconstant "github.com/spidernet-io/spiderpool/pkg/constant"
 	spiderpool "github.com/spidernet-io/spiderpool/pkg/k8s/apis/spiderpool.spidernet.io/v2beta1"
 	"github.com/spidernet-io/spiderpool/pkg/types"
+	"github.com/spidernet-io/spiderpool/pkg/utils/retry"
 	"github.com/spidernet-io/spiderpool/test/e2e/common"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -432,7 +433,10 @@ var _ = Describe("test annotation", Label("annotation"), func() {
 				GinkgoWriter.Printf("Generate namespace objects: %v with namespace annotations \n", namespaceObject)
 
 				// Update the namespace with the generated namespace object with annotation
-				Expect(frame.UpdateResource(namespaceObject)).NotTo(HaveOccurred())
+				err = retry.RetryOnConflictWithContext(context.Background(), retry.DefaultBackoff, func(ctx context.Context) error {
+					return frame.UpdateResource(namespaceObject)
+				})
+				Expect(err).NotTo(HaveOccurred())
 				GinkgoWriter.Printf("Succeeded to update namespace: %v object \n", nsName)
 			})
 
@@ -1036,7 +1040,11 @@ var _ = Describe("test annotation", Label("annotation"), func() {
 			if frame.Info.IpV6Enabled {
 				newSpiderMultusConfig.Spec.MacvlanConfig.SpiderpoolConfigPools.IPv6IPPool = []string{v6PoolName1}
 			}
-			Expect(frame.UpdateResource(newSpiderMultusConfig)).NotTo(HaveOccurred())
+
+			err = retry.RetryOnConflictWithContext(context.Background(), retry.DefaultBackoff, func(ctx context.Context) error {
+				return frame.UpdateResource(newSpiderMultusConfig)
+			})
+			Expect(err).NotTo(HaveOccurred())
 			Eventually(func() bool {
 				_, err := frame.GetSpiderMultusInstance(nsName, spiderMultusNadName)
 				return !errors.IsNotFound(err)
@@ -1157,7 +1165,11 @@ var _ = Describe("test annotation", Label("annotation"), func() {
 				common.MultusDefaultNetwork: fmt.Sprintf("%s/%s", common.MultusNs, common.MacvlanUnderlayVlan0),
 				common.MultusNetworks:       fmt.Sprintf("%s/%s", common.MultusNs, common.MacvlanVlan100),
 			}
-			Expect(frame.UpdateResource(stsObj)).NotTo(HaveOccurred())
+
+			err = retry.RetryOnConflictWithContext(context.Background(), retry.DefaultBackoff, func(ctx context.Context) error {
+				return frame.UpdateResource(stsObj)
+			})
+			Expect(err).NotTo(HaveOccurred())
 
 			// 5.After the corresponding NIC's IP pool is changed, the IP of the stateful application can also be updated.
 			newPodList := &corev1.PodList{}