pkg: status: use u/s function to find conditions

Since we are relying on `"k8s.io/apimachinery/pkg/api/meta"` function to update the conditions, use also the u/s
function to find the condition.

Only replacing the occurances of the removed function was assisted by Cursor.

Assisted-by: Cursor v1.2.2
AI-Attribution: AIA Primarily human, Stylistic edits, Human-initiated, Reviewed v1.0
Signed-off-by: Shereen Haj <shajmakh@redhat.com>

Author: shajmakh

internal/controller/numaresourcesscheduler_controller.go

@@ -26,6 +26,7 @@ import (
 	rbacv1 "k8s.io/api/rbac/v1"
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metahelper "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -368,7 +369,7 @@ func platformNormalize(spec *nropv1.NUMAResourcesSchedulerSpec, platInfo platfor
 }
 
 func updateDedicatedInformerCondition(conds []metav1.Condition, instance nropv1.NUMAResourcesScheduler, normalized nropv1.NUMAResourcesSchedulerSpec) []metav1.Condition {
-	condition := status.FindCondition(conds, status.ConditionDedicatedInformerActive)
+	condition := metahelper.FindStatusCondition(conds, status.ConditionDedicatedInformerActive)
 	if condition == nil { // should never happen
 		klog.InfoS("missing condition: %q", status.ConditionDedicatedInformerActive)
 		return conds

internal/schedcache/synced.go

@@ -26,6 +26,7 @@ import (
 	"github.com/go-logr/logr"
 
 	corev1 "k8s.io/api/core/v1"
+	metahelper "k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/klog/v2"
@@ -62,7 +63,7 @@ func HasSynced(env *Env, nodeNames []string) (bool, map[string]sets.Set[string],
 		return false, nil, err
 	}
 
-	cond := status.FindCondition(nroSched.Status.Conditions, status.ConditionAvailable)
+	cond := metahelper.FindStatusCondition(nroSched.Status.Conditions, status.ConditionAvailable)
 	if cond == nil {
 		return false, nil, fmt.Errorf("missing condition: available")
 	}

pkg/status/status.go

@@ -100,7 +100,7 @@ func ComputeConditions(currentConditions []metav1.Condition, cond metav1.Conditi
 // UpdateConditionsInPlace mutates the given conditions, setting the value of the one pointed out to `condition` to the given values.
 // Differently from `ComputeConditions`, it doesn't allocate new data. Returns true if successfully mutated conditions, false otherwise
 func UpdateConditionsInPlace(conds []metav1.Condition, condition metav1.Condition, ts time.Time) bool {
-	cond := FindCondition(conds, condition.Type)
+	cond := metahelper.FindStatusCondition(conds, condition.Type)
 	if cond == nil {
 		return false // should never happen
 	}
@@ -127,17 +127,6 @@ func updateBaseCondition(conds []metav1.Condition, condition metav1.Condition, t
 	return updated
 }
 
-// FindCondition returns a pointer to the Condition object matching the given `condition` by type on success, nil otherwise.
-func FindCondition(conditions []metav1.Condition, condition string) *metav1.Condition {
-	for idx := 0; idx < len(conditions); idx++ {
-		cond := &conditions[idx]
-		if cond.Type == condition {
-			return cond
-		}
-	}
-	return nil
-}
-
 // NewBaseConditions creates a new set of pristine conditions. The given `condition` is set, and its `reason` and `message` are
 // optionally set. Note that Available always imply Upgradeable, and that we ignore `reason` and `message` for it.
 func NewBaseConditions(cond metav1.Condition, now time.Time) []metav1.Condition {

pkg/status/status_test.go

@@ -36,46 +36,6 @@ import (
 	testobjs "github.com/openshift-kni/numaresources-operator/internal/objects"
 )
 
-func TestFindCondition(t *testing.T) {
-	type testCase struct {
-		name          string
-		desired       string
-		conds         []metav1.Condition
-		expectedFound bool
-	}
-
-	now := time.Now()
-	testCases := []testCase{
-		{
-			name:          "nil conditions",
-			desired:       ConditionAvailable,
-			expectedFound: false,
-		},
-		{
-			name:          "missing condition",
-			desired:       "foobar",
-			conds:         defaultBaseConditions(now),
-			expectedFound: false,
-		},
-		{
-			name:          "found condition",
-			desired:       ConditionProgressing,
-			conds:         defaultBaseConditions(now),
-			expectedFound: true,
-		},
-	}
-
-	for _, tcase := range testCases {
-		t.Run(tcase.name, func(t *testing.T) {
-			cond := FindCondition(tcase.conds, tcase.desired)
-			found := (cond != nil)
-			if found != tcase.expectedFound {
-				t.Errorf("failure looking for condition %q: got=%v expected=%v", tcase.desired, found, tcase.expectedFound)
-			}
-		})
-	}
-}
-
 func TestComputeConditions(t *testing.T) {
 	err := nropv1.AddToScheme(scheme.Scheme)
 	if err != nil {

test/e2e/install/install_test.go

@@ -24,6 +24,7 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
+	metahelper "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
@@ -91,7 +92,7 @@ var _ = Describe("[Install] continuousIntegration", Serial, func() {
 					return false, err
 				}
 
-				cond := status.FindCondition(updatedNROObj.Status.Conditions, status.ConditionAvailable)
+				cond := metahelper.FindStatusCondition(updatedNROObj.Status.Conditions, status.ConditionAvailable)
 				if cond == nil {
 					klog.InfoS("missing conditions", "nroObj", updatedNROObj)
 					return false, err
@@ -180,7 +181,7 @@ var _ = Describe("[Install] durability", Serial, func() {
 					return false
 				}
 
-				cond := status.FindCondition(updatedNROObj.Status.Conditions, status.ConditionDegraded)
+				cond := metahelper.FindStatusCondition(updatedNROObj.Status.Conditions, status.ConditionDegraded)
 				if cond == nil {
 					klog.InfoS("missing conditions", "nroObj", updatedNROObj)
 					return false

test/e2e/sched/install/install_test.go

@@ -22,6 +22,7 @@ import (
 	"time"
 
 	appsv1 "k8s.io/api/apps/v1"
+	metahelper "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
 
@@ -114,7 +115,7 @@ var _ = Describe("[Scheduler] install", func() {
 
 func isReportedAvailable(conditions []metav1.Condition) bool {
 	// conditions that should be True
-	availableCond := status.FindCondition(conditions, status.ConditionAvailable)
+	availableCond := metahelper.FindStatusCondition(conditions, status.ConditionAvailable)
 	if availableCond == nil {
 		klog.InfoS("missing available condition status")
 		return false
@@ -124,7 +125,7 @@ func isReportedAvailable(conditions []metav1.Condition) bool {
 		return false
 	}
 
-	upgradeCond := status.FindCondition(conditions, status.ConditionUpgradeable)
+	upgradeCond := metahelper.FindStatusCondition(conditions, status.ConditionUpgradeable)
 	if upgradeCond == nil {
 		klog.InfoS("missing upgradeable condition status")
 		return false
@@ -135,7 +136,7 @@ func isReportedAvailable(conditions []metav1.Condition) bool {
 	}
 
 	// conditions that should be False
-	degradedCond := status.FindCondition(conditions, status.ConditionDegraded)
+	degradedCond := metahelper.FindStatusCondition(conditions, status.ConditionDegraded)
 	if degradedCond == nil {
 		klog.Info("missing degraded condition status")
 		return false
@@ -145,7 +146,7 @@ func isReportedAvailable(conditions []metav1.Condition) bool {
 		return false
 	}
 
-	progressCond := status.FindCondition(conditions, status.ConditionProgressing)
+	progressCond := metahelper.FindStatusCondition(conditions, status.ConditionProgressing)
 	if progressCond == nil {
 		klog.Info("missing progressing condition status")
 		return false

test/e2e/serial/tests/configuration.go

@@ -31,6 +31,7 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
+	metahelper "k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -997,7 +998,7 @@ var _ = Describe("[serial][disruptive] numaresources configuration management",
 					By("verify the operator is in Available condition")
 					Eventually(func(g Gomega) {
 						g.Expect(fxt.Client.Get(ctx, nroKey, &updatedNRO)).To(Succeed())
-						cond := status.FindCondition(updatedNRO.Status.Conditions, status.ConditionAvailable)
+						cond := metahelper.FindStatusCondition(updatedNRO.Status.Conditions, status.ConditionAvailable)
 						g.Expect(cond).ToNot(BeNil(), "condition Available was not found: %+v", updatedNRO.Status.Conditions)
 						g.Expect(cond.Status).To(Equal(metav1.ConditionTrue), "Expected operators condition to be Available, but was found something else: %+v", updatedNRO.Status.Conditions)
 					}).WithTimeout(5*time.Minute).WithPolling(5*time.Second).Should(Succeed(), "operator did not return to Available state in time")
@@ -1087,7 +1088,7 @@ var _ = Describe("[serial][disruptive] numaresources configuration management",
 
 					By("verify the operator is in Available condition")
 					Expect(fxt.Client.Get(ctx, nroKey, &updatedNRO)).To(Succeed())
-					cond := status.FindCondition(updatedNRO.Status.Conditions, status.ConditionAvailable)
+					cond := metahelper.FindStatusCondition(updatedNRO.Status.Conditions, status.ConditionAvailable)
 					Expect(cond).ToNot(BeNil(), "expected operators conditions to be Available but was found something else: %+v", updatedNRO.Status.Conditions)
 				}()
 
@@ -1195,7 +1196,7 @@ var _ = Describe("[serial][disruptive] numaresources configuration management",
 					By("verifying the operator is in Available condition")
 					Eventually(func(g Gomega) {
 						g.Expect(fxt.Client.Get(ctx, nroKey, &updatedNRO)).To(Succeed())
-						cond := status.FindCondition(updatedNRO.Status.Conditions, status.ConditionAvailable)
+						cond := metahelper.FindStatusCondition(updatedNRO.Status.Conditions, status.ConditionAvailable)
 						g.Expect(cond).ToNot(BeNil(), "condition Available was not found: %+v", updatedNRO.Status.Conditions)
 						g.Expect(cond.Status).To(Equal(metav1.ConditionTrue), "Expected operator condition to be Available=True, but got something else: %+v", updatedNRO.Status.Conditions)
 					}).WithTimeout(5*time.Minute).WithPolling(5*time.Second).Should(Succeed(), "operator did not return to Available state in time")
@@ -1257,7 +1258,7 @@ var _ = Describe("[serial][disruptive] numaresources configuration management",
 					By("verify the operator is in Available condition")
 					Eventually(func(g Gomega) {
 						g.Expect(fxt.Client.Get(ctx, nroKey, &updatedNRO)).To(Succeed())
-						cond := status.FindCondition(updatedNRO.Status.Conditions, status.ConditionAvailable)
+						cond := metahelper.FindStatusCondition(updatedNRO.Status.Conditions, status.ConditionAvailable)
 						g.Expect(cond).ToNot(BeNil(), "condition Available was not found: %+v", updatedNRO.Status.Conditions)
 						g.Expect(cond.Status).To(Equal(metav1.ConditionTrue), "Expected operators condition to be Available=True, but was found something else: %+v", updatedNRO.Status.Conditions)
 					}).WithTimeout(5*time.Minute).WithPolling(5*time.Second).Should(Succeed(), "operator did not return to Available state in time")
@@ -1496,7 +1497,7 @@ func isNROSchedAvailableAt(nrosStatus *nropv1.NUMAResourcesSchedulerStatus, gen
 	if nrosStatus == nil {
 		return false
 	}
-	cond := status.FindCondition(nrosStatus.Conditions, status.ConditionAvailable)
+	cond := metahelper.FindStatusCondition(nrosStatus.Conditions, status.ConditionAvailable)
 	if cond == nil {
 		return false
 	}
@@ -1514,7 +1515,7 @@ func isNROOperAvailableAt(nropStatus *nropv1.NUMAResourcesOperatorStatus, gen in
 	if nropStatus == nil {
 		return false
 	}
-	cond := status.FindCondition(nropStatus.Conditions, status.ConditionAvailable)
+	cond := metahelper.FindStatusCondition(nropStatus.Conditions, status.ConditionAvailable)
 	if cond == nil {
 		return false
 	}

test/e2e/serial/tests/tolerations.go

@@ -25,6 +25,7 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
+	metahelper "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	kvalidation "k8s.io/apimachinery/pkg/util/validation/field"
@@ -836,7 +837,7 @@ func isRTEPodFoundOnNode(cli client.Client, ctx context.Context, nodeName string
 }
 
 func isDegradedWith(conds []metav1.Condition, msgContains string, reason string) bool {
-	cond := status.FindCondition(conds, status.ConditionDegraded)
+	cond := metahelper.FindStatusCondition(conds, status.ConditionDegraded)
 	if cond == nil {
 		return false
 	}

test/internal/deploy/deploy.go

@@ -22,6 +22,7 @@ import (
 
 	"golang.org/x/sync/errgroup"
 
+	metahelper "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
 
@@ -125,7 +126,7 @@ func DeployNROScheduler(ctx context.Context, timeout time.Duration) *nropv1.NUMA
 		}
 		nroSchedObj = updatedNROObj
 
-		cond := status.FindCondition(updatedNROObj.Status.Conditions, status.ConditionAvailable)
+		cond := metahelper.FindStatusCondition(updatedNROObj.Status.Conditions, status.ConditionAvailable)
 		if cond == nil {
 			klog.Warningf("missing conditions in %v", updatedNROObj)
 			return false

test/internal/nrosched/nrosched.go

@@ -23,6 +23,7 @@ import (
 	"time"
 
 	corev1 "k8s.io/api/core/v1"
+	metahelper "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/client-go/kubernetes"
@@ -168,7 +169,7 @@ func CheckNROSchedulerAvailable(ctx context.Context, cli client.Client, schedObj
 		if err != nil {
 			return fmt.Errorf("failed to get the scheduler resource: %v", err)
 		}
-		cond := status.FindCondition(nroSchedObj.Status.Conditions, status.ConditionAvailable)
+		cond := metahelper.FindStatusCondition(nroSchedObj.Status.Conditions, status.ConditionAvailable)
 		if cond == nil {
 			return fmt.Errorf("missing conditions in %v", nroSchedObj)
 		}