init unAvailable func in podlifecycle and update ruleset sample (#50)

* init unAvailable func and update ruleset sample * fix ut
KusionStack · Aug 22, 2023 · f3bf107 · f3bf107
1 parent bc4476b
commit f3bf107
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 14 deletions.
diff --git a/config/samples/apps_v1alpha1_ruleset.yaml b/config/samples/apps_v1alpha1_ruleset.yaml
@@ -9,4 +9,10 @@ metadata:
     app.kubernetes.io/created-by: kusionstack
   name: ruleset-sample
 spec:
-  # TODO(user): Add fields here
+  rules:
+  - availablePolicy:
+      maxUnavailableValue: 50%
+    name: maxUnavailable
+  selector:
+    matchLabels:
+      app: foo
diff --git a/pkg/controllers/podopslifecycle/podopslifecycle_controller.go b/pkg/controllers/podopslifecycle/podopslifecycle_controller.go
@@ -38,6 +38,7 @@ import (
 
 	"kusionstack.io/kafed/apis/apps/v1alpha1"
 	"kusionstack.io/kafed/pkg/controllers/ruleset"
+	"kusionstack.io/kafed/pkg/controllers/utils"
 	"kusionstack.io/kafed/pkg/controllers/utils/expectations"
 	"kusionstack.io/kafed/pkg/log"
 )
@@ -89,7 +90,7 @@ func NewReconciler(mgr manager.Manager) *ReconcilePodOpsLifecycle {
 		recorder:    mgr.GetEventRecorderFor(controllerName),
 		expectation: expectation,
 	}
-	r.registerStages()
+	r.initRuleSetManager()
 
 	return r
 }
@@ -288,7 +289,7 @@ func (r *ReconcilePodOpsLifecycle) addLabels(ctx context.Context, pod *corev1.Po
 	})
 }
 
-func (r *ReconcilePodOpsLifecycle) registerStages() {
+func (r *ReconcilePodOpsLifecycle) initRuleSetManager() {
 	r.ruleSetManager.RegisterStage(v1alpha1.PodOpsLifecyclePreCheckStage, func(po client.Object) bool {
 		labels := po.GetLabels()
 		return labels != nil && labelHasPrefix(labels, v1alpha1.PodPreCheckLabelPrefix)
@@ -297,6 +298,9 @@ func (r *ReconcilePodOpsLifecycle) registerStages() {
 		labels := po.GetLabels()
 		return labels != nil && labelHasPrefix(labels, v1alpha1.PodPostCheckLabelPrefix)
 	})
+	ruleset.AddUnAvailableFunc(func(po *corev1.Pod) (bool, *int64) {
+		return !utils.IsServiceAvailable(po), nil
+	})
 }
 
 func labelHasPrefix(labels map[string]string, prefix string) bool {

diff --git a/pkg/controllers/ruleset/processor/rules/available.go b/pkg/controllers/ruleset/processor/rules/available.go
@@ -73,7 +73,7 @@ func (r *AvailableRuler) Filter(ruleSet *appsv1alpha1.RuleSet, targets map[strin
 	// TODO: UncreatedReplicas
 	// allowUnavailable -= uncreatedReplicas
 	allAvailableSize := 0
-	var minTimeLeft *int32
+	var minTimeLeft *int64
 	// filter unavailable pods
 	for podName := range effectiveTargets {
 		pod := targets[podName]
@@ -150,9 +150,9 @@ func (r *AvailableRuler) getPodReplicaSetReplication(controllerRef *metav1.Owner
 	return int(*rs.Spec.Replicas), true, nil
 }
 
-func processUnavailableFunc(pod *corev1.Pod) (bool, *int32) {
+func processUnavailableFunc(pod *corev1.Pod) (bool, *int64) {
 	isUnavailable := false
-	var minInterval *int32
+	var minInterval *int64
 	for _, f := range register.UnAvailableFuncList {
 		unavailable, interval := f(pod)
 		if !unavailable {
@@ -168,7 +168,7 @@ func processUnavailableFunc(pod *corev1.Pod) (bool, *int32) {
 	return isUnavailable, minInterval
 }
 
-func min(a, b *int32) *int32 {
+func min(a, b *int64) *int64 {
 	if a == nil {
 		return b
 	}

diff --git a/pkg/controllers/ruleset/register/common.go b/pkg/controllers/ruleset/register/common.go
@@ -26,14 +26,10 @@ var (
 	UnAvailableFuncList []UnAvailableFunc
 )
 
-func AddUnAvailableFunc(f func(pod *corev1.Pod) (bool, *int32)) {
-	UnAvailableFuncList = append(UnAvailableFuncList, f)
-}
-
-type UnAvailableFunc func(pod *corev1.Pod) (bool, *int32)
+type UnAvailableFunc func(pod *corev1.Pod) (bool, *int64)
 
 func DefaultInit() {
-	UnAvailableFuncList = append(UnAvailableFuncList, func(pod *corev1.Pod) (bool, *int32) {
+	UnAvailableFuncList = append(UnAvailableFuncList, func(pod *corev1.Pod) (bool, *int64) {
 		return !utils.IsPodReady(pod) || utils.IsPodTerminal(pod), nil
 	})
 }
diff --git a/pkg/controllers/ruleset/ruleset_controller_manager.go b/pkg/controllers/ruleset/ruleset_controller_manager.go
@@ -19,6 +19,7 @@ package ruleset
 import (
 	"context"
 
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/util/workqueue"
@@ -78,6 +79,10 @@ func RegisterListenChan(ctx context.Context) *source.Channel {
 	return &source.Channel{Source: ch}
 }
 
+func AddUnAvailableFunc(f func(pod *corev1.Pod) (bool, *int64)) {
+	register.UnAvailableFuncList = append(register.UnAvailableFuncList, f)
+}
+
 func newRulesetManager() ManagerInterface {
 	return &rsManager{
 		register: register.DefaultRegister(),

diff --git a/pkg/controllers/ruleset/ruleset_controller_test.go b/pkg/controllers/ruleset/ruleset_controller_test.go
@@ -125,7 +125,7 @@ const (
 
 func initRulesetManager() {
 
-	register.UnAvailableFuncList = append(register.UnAvailableFuncList, func(pod *corev1.Pod) (bool, *int32) {
+	register.UnAvailableFuncList = append(register.UnAvailableFuncList, func(pod *corev1.Pod) (bool, *int64) {
 		if pod.GetLabels() == nil {
 			return false, nil
 		}