fix ut

pkg/controllers/ruleset/checker/checker.go

@@ -43,12 +43,8 @@ type checker struct {
 }
 
 func (c *checker) GetState(client client.Client, item client.Object) (CheckState, error) {
-	/*
-		Check Current Stage
-	*/
 
 	result := CheckState{
-		//Item:   item,
 		Passed: true,
 	}
 	stage := c.policy.Stage(item)

pkg/controllers/ruleset/register/cache.go

@@ -106,6 +106,7 @@ func inFunc(obj client.Object, keys sets.String, cache *FuncCache) string {
 		for _, f := range fs {
 			if !f(obj) {
 				needCheck = false
+				break
 			}
 		}
 		if needCheck {

pkg/controllers/ruleset/ruleset_controller_manager.go

@@ -95,7 +95,6 @@ type rsManager struct {
 	register   register.Register
 	checker    checker.Check
 	controller controller.Controller
-	watchKinds []*source.Kind
 }
 
 func (m *rsManager) RegisterStage(key string, needCheck func(obj client.Object) bool) error {
@@ -112,21 +111,5 @@ func (m *rsManager) GetState(c client.Client, item client.Object) (checker.Check
 
 func (m *rsManager) SetupRuleSetController(mgr manager.Manager) (err error) {
 	m.controller, err = addToMgr(mgr, newReconciler(mgr))
-	if err != nil {
-		return err
-	}
-	for i := range m.watchKinds {
-		if err = m.controller.Watch(m.watchKinds[i], &EventHandler{}); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (m *rsManager) Watch(src *source.Kind) error {
-	if m.controller == nil {
-		m.watchKinds = append(m.watchKinds, src)
-		return nil
-	}
-	return m.controller.Watch(src, &EventHandler{})
+	return err
 }

pkg/controllers/ruleset/ruleset_controller_suit_test.go

@@ -60,6 +60,7 @@ func TestMain(m *testing.M) {
 	env.ControlPlane.GetAPIServer().URL = &url.URL{
 		Host: "127.0.0.1:10001",
 	}
+	initRulesetManager()
 	config, err := env.Start()
 	if err != nil {
 		panic(err)
@@ -75,8 +76,6 @@ func TestMain(m *testing.M) {
 
 		c = mgr.GetClient()
 
-		initRulesetManager()
-
 		defer wg.Done()
 		err = mgr.Start(ctx)
 		if err != nil {

pkg/controllers/ruleset/ruleset_controller_test.go

@@ -50,11 +50,6 @@ func TestRuleset(t *testing.T) {
 	for _, po := range pods {
 		g.Expect(c.Create(context.TODO(), po)).NotTo(gomega.HaveOccurred())
 	}
-	defer func() {
-		for _, po := range pods {
-			c.Delete(context.TODO(), po)
-		}
-	}()
 	istr := intstr.FromString("50%")
 	stage := PreTrafficOffStage
 	rs := &appsv1alpha1.RuleSet{
@@ -82,8 +77,13 @@ func TestRuleset(t *testing.T) {
 		},
 	}
 	g.Expect(c.Create(context.TODO(), rs)).NotTo(gomega.HaveOccurred())
-	defer c.Delete(context.TODO(), rs)
 	waitProcessFinished(request)
+	defer func() {
+		for _, po := range pods {
+			g.Expect(c.Delete(context.TODO(), po)).NotTo(gomega.HaveOccurred())
+		}
+		g.Expect(c.Delete(context.TODO(), rs)).NotTo(gomega.HaveOccurred())
+	}()
 	podList := &corev1.PodList{}
 	g.Expect(c.List(context.TODO(), podList, &client.ListOptions{
 		LabelSelector: labels.SelectorFromSet(rs.Spec.Selector.MatchLabels),
@@ -132,7 +132,6 @@ func initRulesetManager() {
 		_, ok := pod.GetLabels()[UnavailableLabel]
 		return ok, nil
 	})
-
 	RuleSetManager().RegisterStage(PreTrafficOffStage, func(po client.Object) bool {
 		if po.GetLabels() == nil {
 			return false