fix: configmap check

openyurtio · Feb 17, 2025 · 61f9054 · 61f9054
1 parent f2ead9e
commit 61f9054
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/pkg/yurtmanager/controller/hubleaderconfig/hubleaderconfig_controller.go b/pkg/yurtmanager/controller/hubleaderconfig/hubleaderconfig_controller.go
@@ -82,8 +82,7 @@ func Add(ctx context.Context, cfg *appconfig.CompletedConfig, mgr manager.Manage
 			return ok
 		},
 		DeleteFunc: func(e event.DeleteEvent) bool {
-			_, ok := e.Object.(*appsv1beta2.NodePool)
-			return ok
+			return false
 		},
 		UpdateFunc: func(e event.UpdateEvent) bool {
 			oldPool, ok := e.ObjectOld.(*appsv1beta2.NodePool)

diff --git a/test/e2e/yurt/hubleader.go b/test/e2e/yurt/hubleader.go
@@ -27,6 +27,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/util/retry"
@@ -304,12 +305,15 @@ var _ = Describe("Hub leader config owner cleanup", func() {
 					client.ObjectKey{Name: "leader-hub-" + npName, Namespace: metav1.NamespaceSystem},
 					&v1.ConfigMap{},
 				)
-				if err != nil && client.IgnoreNotFound(err) != nil {
+				if err != nil {
+					if errors.IsNotFound(err) {
+						return nil
+					}
 					return err
 				}
-				return nil
+				return fmt.Errorf("leader config map still exists")
 			},
-			time.Second*5, time.Millisecond*500).Should(BeNil())
+			time.Second*30, time.Millisecond*500).Should(BeNil())
 	})
 })