Move lowestNonZeroRetryAfterSeconds to util

Signed-off-by: Bingtan Lu <[email protected]>

Author: LuBingtan

internal/controllers/topology/cluster/scope/hookresponsetracker.go

@@ -23,6 +23,7 @@ import (
 
 	runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog"
 	runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
+	"sigs.k8s.io/cluster-api/util"
 )
 
 // HookResponseTracker is a helper to capture the responses of the various lifecycle hooks.
@@ -48,7 +49,7 @@ func (h *HookResponseTracker) AggregateRetryAfter() time.Duration {
 	res := int32(0)
 	for _, resp := range h.responses {
 		if retryResponse, ok := resp.(runtimehooksv1.RetryResponseObject); ok {
-			res = lowestNonZeroRetryAfterSeconds(res, retryResponse.GetRetryAfterSeconds())
+			res = util.LowestNonZeroInt32(res, retryResponse.GetRetryAfterSeconds())
 		}
 	}
 	return time.Duration(res) * time.Second
@@ -74,16 +75,3 @@ func (h *HookResponseTracker) AggregateMessage() string {
 	}
 	return strings.Join(hookAndMessages, "; ")
 }
-
-func lowestNonZeroRetryAfterSeconds(i, j int32) int32 {
-	if i == 0 {
-		return j
-	}
-	if j == 0 {
-		return i
-	}
-	if i < j {
-		return i
-	}
-	return j
-}

internal/runtime/client/client.go

@@ -263,7 +263,7 @@ func aggregateSuccessfulResponses(aggregatedResponse runtimehooksv1.ResponseObje
 	for _, resp := range responses {
 		aggregatedRetryResponse, ok := aggregatedResponse.(runtimehooksv1.RetryResponseObject)
 		if ok {
-			aggregatedRetryResponse.SetRetryAfterSeconds(lowestNonZeroRetryAfterSeconds(
+			aggregatedRetryResponse.SetRetryAfterSeconds(util.LowestNonZeroInt32(
 				aggregatedRetryResponse.GetRetryAfterSeconds(),
 				resp.(runtimehooksv1.RetryResponseObject).GetRetryAfterSeconds(),
 			))
@@ -275,20 +275,6 @@ func aggregateSuccessfulResponses(aggregatedResponse runtimehooksv1.ResponseObje
 	aggregatedResponse.SetMessage(strings.Join(messages, ", "))
 }
 
-// lowestNonZeroRetryAfterSeconds returns the lowest non-zero value of the two provided values.
-func lowestNonZeroRetryAfterSeconds(i, j int32) int32 {
-	if i == 0 {
-		return j
-	}
-	if j == 0 {
-		return i
-	}
-	if i < j {
-		return i
-	}
-	return j
-}
-
 // CallExtension makes the call to the extension with the given name.
 // The response object passed will be updated with the response of the call.
 // An error is returned if the extension is not compatible with the hook.

util/util.go

@@ -593,6 +593,20 @@ func LowestNonZeroResult(i, j ctrl.Result) ctrl.Result {
 	}
 }
 
+// LowestNonZeroInt32 returns the lowest non-zero value of the two provided values.
+func LowestNonZeroInt32(i, j int32) int32 {
+	if i == 0 {
+		return j
+	}
+	if j == 0 {
+		return i
+	}
+	if i < j {
+		return i
+	}
+	return j
+}
+
 // IsNil returns an error if the passed interface is equal to nil or if it has an interface value of nil.
 func IsNil(i interface{}) bool {
 	if i == nil {