promote ruleset manager interface

KusionStack · Aug 17, 2023 · 2bba136 · 2bba136
1 parent 9a75786
commit 2bba136
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 59 deletions.
diff --git a/pkg/controllers/podopslifecycle/podopslifecycle_controller.go b/pkg/controllers/podopslifecycle/podopslifecycle_controller.go
@@ -291,17 +291,11 @@ func (r *ReconcilePodOpsLifecycle) addLabels(ctx context.Context, pod *corev1.Po
 func (r *ReconcilePodOpsLifecycle) registerStages() {
 	r.ruleSetManager.RegisterStage(v1alpha1.PodOpsLifecyclePreCheckStage, func(po client.Object) bool {
 		labels := po.GetLabels()
-		if labels == nil {
-			return false
-		}
-		return labelHasPrefix(labels, v1alpha1.PodPreCheckLabelPrefix)
+		return labels == nil && labelHasPrefix(labels, v1alpha1.PodPreCheckLabelPrefix)
 	})
 	r.ruleSetManager.RegisterStage(v1alpha1.PodOpsLifecyclePostCheckStage, func(po client.Object) bool {
 		labels := po.GetLabels()
-		if labels == nil {
-			return false
-		}
-		return labelHasPrefix(labels, v1alpha1.PodPostCheckLabelPrefix)
+		return labels != nil && labelHasPrefix(labels, v1alpha1.PodPostCheckLabelPrefix)
 	})
 }
 

diff --git a/pkg/controllers/podopslifecycle/podopslifecycle_controller_test.go b/pkg/controllers/podopslifecycle/podopslifecycle_controller_test.go
@@ -298,12 +298,10 @@ type mockRuleSetManager struct {
 	*checker.CheckState
 }
 
-func (rsm *mockRuleSetManager) RegisterStage(key string, inStage func(obj client.Object) bool) error {
-	return nil
+func (rsm *mockRuleSetManager) RegisterStage(key string, inStage func(obj client.Object) bool) {
 }
 
-func (rsm *mockRuleSetManager) RegisterCondition(opsCondition string, inCondition func(obj client.Object) bool) error {
-	return nil
+func (rsm *mockRuleSetManager) RegisterCondition(opsCondition string, inCondition func(obj client.Object) bool) {
 }
 
 func (rsm *mockRuleSetManager) SetupRuleSetController(manager.Manager) error {

diff --git a/pkg/controllers/ruleset/register/cache.go b/pkg/controllers/ruleset/register/cache.go
@@ -50,21 +50,19 @@ type cache struct {
 	mu sync.Mutex
 }
 
-func (r *cache) RegisterStage(stage string, inStage func(obj client.Object) bool) error {
+func (r *cache) RegisterStage(stage string, inStage func(obj client.Object) bool) {
 	r.mu.Lock()
 	defer r.mu.Unlock()
 	r.stages = append(r.stages, stage)
 	r.stageKey.Insert(stage)
 	r.inStageFunc.Add(stage, inStage)
-	return nil
 }
 
-func (r *cache) RegisterCondition(opsCondition string, inCondition func(obj client.Object) bool) error {
+func (r *cache) RegisterCondition(opsCondition string, inCondition func(obj client.Object) bool) {
 	r.mu.Lock()
 	defer r.mu.Unlock()
 	r.conditionKey.Insert(opsCondition)
 	r.condition.Add(opsCondition, inCondition)
-	return nil
 }
 
 func (r *cache) Stage(obj client.Object) string {

diff --git a/pkg/controllers/ruleset/register/default.go b/pkg/controllers/ruleset/register/default.go
@@ -37,6 +37,6 @@ type Policy interface {
 }
 
 type Register interface {
-	RegisterStage(key string, inStage func(obj client.Object) bool) error
-	RegisterCondition(opsCondition string, inCondition func(obj client.Object) bool) error
+	RegisterStage(key string, inStage func(obj client.Object) bool)
+	RegisterCondition(opsCondition string, inCondition func(obj client.Object) bool)
 }
diff --git a/pkg/controllers/ruleset/register/kind.go b/pkg/controllers/ruleset/register/kind.go
diff --git a/pkg/controllers/ruleset/ruleset_controller_manager.go b/pkg/controllers/ruleset/ruleset_controller_manager.go
@@ -97,12 +97,12 @@ type rsManager struct {
 	controller controller.Controller
 }
 
-func (m *rsManager) RegisterStage(key string, needCheck func(obj client.Object) bool) error {
-	return m.register.RegisterStage(key, needCheck)
+func (m *rsManager) RegisterStage(key string, needCheck func(obj client.Object) bool) {
+	m.register.RegisterStage(key, needCheck)
 }
 
-func (m *rsManager) RegisterCondition(opsCondition string, inCondition func(obj client.Object) bool) error {
-	return m.register.RegisterCondition(opsCondition, inCondition)
+func (m *rsManager) RegisterCondition(opsCondition string, inCondition func(obj client.Object) bool) {
+	m.register.RegisterCondition(opsCondition, inCondition)
 }
 
 func (m *rsManager) GetState(c client.Client, item client.Object) (checker.CheckState, error) {