refactor

metal-stack · Nov 4, 2024 · 9605a18 · 9605a18
1 parent 0de0032
commit 9605a18
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 46 deletions.
diff --git a/controllers/set/delete.go b/controllers/set/delete.go
@@ -45,15 +45,10 @@ func (c *controller) deleteFirewalls(r *controllers.Ctx[*v2.FirewallSet], fws ..
 
 	return nil
 }
-
 func (c *controller) deleteIfUnhealthyOrTimeout(r *controllers.Ctx[*v2.FirewallSet], fws ...*v2.Firewall) ([]*v2.Firewall, error) {
 	var result []*v2.Firewall
 
 	for _, fw := range fws {
-		fw := fw
-
-		connected := pointer.SafeDeref(fw.Status.Conditions.Get(v2.FirewallControllerConnected)).Status == v2.ConditionTrue
-
 		if c.isFirewallUnhealthy(fw) {
 			r.Log.Info("unhealthy firewall not recovering, deleting from set", "firewall-name", fw.Name)
 			err := c.deleteFirewalls(r, fw)
@@ -67,40 +62,20 @@ func (c *controller) deleteIfUnhealthyOrTimeout(r *controllers.Ctx[*v2.FirewallS
 		if fw.Status.Phase != v2.FirewallPhaseCreating {
 			continue
 		}
-
+		connected := pointer.SafeDeref(fw.Status.Conditions.Get(v2.FirewallControllerConnected)).Status == v2.ConditionTrue
 		if !connected && time.Since(fw.CreationTimestamp.Time) > c.c.GetCreateTimeout() {
 			r.Log.Info("firewall not getting ready, deleting from set", "firewall-name", fw.Name)
-
 			err := c.deleteFirewalls(r, fw)
 			if err != nil {
 				return nil, err
 			}
-
 			result = append(result, fw)
-
 		}
 	}
-
 	return result, nil
 }
 
 func (c *controller) isFirewallUnhealthy(fw *v2.Firewall) bool {
-
-	var (
-		created       = pointer.SafeDeref(fw.Status.Conditions.Get(v2.FirewallCreated)).Status == v2.ConditionTrue
-		ready         = pointer.SafeDeref(fw.Status.Conditions.Get(v2.FirewallReady)).Status == v2.ConditionTrue
-		connected     = pointer.SafeDeref(fw.Status.Conditions.Get(v2.FirewallControllerConnected)).Status == v2.ConditionTrue
-		seedConnected = pointer.SafeDeref(fw.Status.Conditions.Get(v2.FirewallControllerSeedConnected)).Status == v2.ConditionTrue
-		distance      = pointer.SafeDeref(fw.Status.Conditions.Get(v2.FirewallDistanceConfigured)).Status == v2.ConditionTrue
-	)
-
-	if created && ready && connected && seedConnected && distance {
-		return false
-	}
-
-	if created && time.Since(pointer.SafeDeref(fw.Status.MachineStatus).AllocationTimestamp.Time) > c.c.GetFirewallHealthTimeout() {
-		return true
-	}
-
-	return false
+	statusReport := evaluateFirewallConditions(fw, c.c.GetFirewallHealthTimeout())
+	return statusReport.IsUnhealthy
 }
diff --git a/controllers/set/status.go b/controllers/set/status.go
@@ -8,35 +8,44 @@ import (
 	"github.com/metal-stack/metal-lib/pkg/pointer"
 )
 
+type FirewallConditionStatus struct {
+	IsReady, IsProgressing, IsUnhealthy bool
+}
+
+func evaluateFirewallConditions(fw *v2.Firewall, healthTimeout time.Duration) FirewallConditionStatus {
+	created := pointer.SafeDeref(fw.Status.Conditions.Get(v2.FirewallCreated)).Status == v2.ConditionTrue
+	ready := pointer.SafeDeref(fw.Status.Conditions.Get(v2.FirewallReady)).Status == v2.ConditionTrue
+	connected := pointer.SafeDeref(fw.Status.Conditions.Get(v2.FirewallControllerConnected)).Status == v2.ConditionTrue
+	seedConnected := pointer.SafeDeref(fw.Status.Conditions.Get(v2.FirewallControllerSeedConnected)).Status == v2.ConditionTrue
+	distance := pointer.SafeDeref(fw.Status.Conditions.Get(v2.FirewallDistanceConfigured)).Status == v2.ConditionTrue
+
+	allConditionsMet := created && ready && connected && seedConnected && distance
+	allocationTimeExceeded := created && time.Since(pointer.SafeDeref(fw.Status.MachineStatus).AllocationTimestamp.Time) < healthTimeout
+	unhealthyTimeExceeded := created && time.Since(pointer.SafeDeref(fw.Status.MachineStatus).AllocationTimestamp.Time) > healthTimeout
+
+	return FirewallConditionStatus{
+		IsReady:       allConditionsMet,
+		IsProgressing: created && allocationTimeExceeded,
+		IsUnhealthy:   !allConditionsMet || unhealthyTimeExceeded,
+	}
+}
+
 func (c *controller) setStatus(r *controllers.Ctx[*v2.FirewallSet], ownedFirewalls []*v2.Firewall) error {
 	r.Target.Status.TargetReplicas = r.Target.Spec.Replicas
-
 	r.Target.Status.ReadyReplicas = 0
 	r.Target.Status.ProgressingReplicas = 0
 	r.Target.Status.UnhealthyReplicas = 0
 
 	for _, fw := range ownedFirewalls {
-		var (
-			fw = fw
-
-			created       = pointer.SafeDeref(fw.Status.Conditions.Get(v2.FirewallCreated)).Status == v2.ConditionTrue
-			ready         = pointer.SafeDeref(fw.Status.Conditions.Get(v2.FirewallReady)).Status == v2.ConditionTrue
-			connected     = pointer.SafeDeref(fw.Status.Conditions.Get(v2.FirewallControllerConnected)).Status == v2.ConditionTrue
-			seedConnected = pointer.SafeDeref(fw.Status.Conditions.Get(v2.FirewallControllerSeedConnected)).Status == v2.ConditionTrue
-			distance      = pointer.SafeDeref(fw.Status.Conditions.Get(v2.FirewallDistanceConfigured)).Status == v2.ConditionTrue
-		)
+		statusReport := evaluateFirewallConditions(fw, c.c.GetFirewallHealthTimeout())
 
-		if created && ready && connected && seedConnected && distance {
+		if statusReport.IsReady {
 			r.Target.Status.ReadyReplicas++
-			continue
-		}
-
-		if created && time.Since(pointer.SafeDeref(fw.Status.MachineStatus).AllocationTimestamp.Time) < c.c.GetFirewallHealthTimeout() {
+		} else if statusReport.IsProgressing {
 			r.Target.Status.ProgressingReplicas++
-			continue
+		} else {
+			r.Target.Status.UnhealthyReplicas++
 		}
-
-		r.Target.Status.UnhealthyReplicas++
 	}
 
 	revision, err := controllers.Revision(r.Target)