Merge pull request AliyunContainerService#765 from l1b0k/feat/event

controlplane: ignore conflict error
l1b0k · Jan 16, 2025 · d4a58b4 · d4a58b4
2 parents 869b56d + e516f20
commit d4a58b4
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pkg/controller/pod/pod_controller.go b/pkg/controller/pod/pod_controller.go
@@ -512,6 +512,9 @@ func (m *ReconcilePod) createENI(ctx context.Context, allocs *[]*v1beta1.Allocat
 	var err error
 	defer func() {
 		if err != nil {
+			if k8sErr.IsConflict(err) {
+				return
+			}
 			l.WithValues("eni", "").Error(err, "create fail")
 			m.record.Eventf(podENI, corev1.EventTypeWarning, types.EventCreateENIFailed, err.Error())
 		} else {