From a4ef4c72a085397a795570cf28893f65330ff7c9 Mon Sep 17 00:00:00 2001 From: Patryk Bundyra Date: Fri, 21 Jun 2024 11:43:29 +0000 Subject: [PATCH] Import metav1 --- .../admissionchecks/provisioning/provisioning.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkg/controller/admissionchecks/provisioning/provisioning.go b/pkg/controller/admissionchecks/provisioning/provisioning.go index fb4593d43b..ef0fc500c9 100644 --- a/pkg/controller/admissionchecks/provisioning/provisioning.go +++ b/pkg/controller/admissionchecks/provisioning/provisioning.go @@ -26,6 +26,7 @@ import ( "github.com/go-logr/logr" apimeta "k8s.io/apimachinery/pkg/api/meta" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" autoscaling "k8s.io/autoscaler/cluster-autoscaler/apis/provisioningrequest/autoscaling.x-k8s.io/v1beta1" kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1" @@ -96,14 +97,12 @@ func getAttemptRegex(workloadName, checkName string) *regexp.Regexp { } func remainingTimeToRetry(pr *autoscaling.ProvisioningRequest, failuresCount int32) time.Duration { - var lastFailureTime time.Time - var cond *v1.Condition + var cond *metav1.Condition if isFailed(pr) { - cond := apimeta.FindStatusCondition(pr.Status.Conditions, autoscaling.Failed) + cond = apimeta.FindStatusCondition(pr.Status.Conditions, autoscaling.Failed) } else { - cond := apimeta.FindStatusCondition(pr.Status.Conditions, autoscaling.BookingExpired) + cond = apimeta.FindStatusCondition(pr.Status.Conditions, autoscaling.BookingExpired) } - lastFailureTime = cond.LastTransitionTime.Time defaultBackoff := time.Duration(MinBackoffSeconds) * time.Second backoffDuration := defaultBackoff for i := 1; i < int(failuresCount); i++ { @@ -113,7 +112,7 @@ func remainingTimeToRetry(pr *autoscaling.ProvisioningRequest, failuresCount int break } } - timeElapsedSinceLastFailure := time.Since(lastFailureTime) + timeElapsedSinceLastFailure := time.Since(cond.LastTransitionTime.Time) return backoffDuration - timeElapsedSinceLastFailure }