fixup: adapt cherry-picked code to 4.21 branch APIs

- Replace DefaultBaseConditions with newBaseConditions (unexported in 4.21)
- Replace metahelper.FindStatusCondition with FindCondition (4.21 local helper)
- Add isNROOperSyncedAt helper using 4.21 status.FindCondition
- Fix errors import shadowing (alias k8s apierrors, keep stdlib errors)

AIA: Primarily AI, New content, Human-initiated, Reviewed, Claude Opus 4.6 v1.0
Signed-off-by: Talor Itzhak <titzhak@redhat.com>

Author: Tal-or

internal/controller/numaresourcesoperator_controller.go

@@ -29,6 +29,7 @@ import (
 	apiextensionv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -212,6 +213,11 @@ func updateStatusConditionsIfNeeded(instance *nropv1.NUMAResourcesOperator, cond
 		ObservedGeneration: instance.Generation,
 	}, time.Now())
 	if ok {
+		for _, c := range instance.Status.Conditions {
+			if status.FindCondition(conditions, c.Type) == nil {
+				conditions = append(conditions, c)
+			}
+		}
 		instance.Status.Conditions = conditions
 	}
 }
@@ -850,7 +856,7 @@ func updateMachineConfigPoolPausedCondition(conditions []metav1.Condition, gener
 		ObservedGeneration: generation,
 		LastTransitionTime: metav1.Now(),
 	}
-	conditions, _ = status.ComputeConditions(conditions, condition, time.Now())
+	apimeta.SetStatusCondition(&conditions, condition)
 	return conditions
 }
 

pkg/status/status.go

@@ -193,18 +193,18 @@ func newBaseConditions(now time.Time) []metav1.Condition {
 }
 
 // NewNUMAResourcesOperatorConditions creates specific operator conditions on
-// top of DefaultBaseConditions.
+// top of newBaseConditions.
 func NewNUMAResourcesOperatorConditions() []metav1.Condition {
 	now := time.Now()
-	return append(DefaultBaseConditions(now), operatorExtraConditions(now)...)
+	return append(newBaseConditions(now), operatorExtraConditions(now)...)
 }
 
 // EnsureNUMAResourcesOperatorConditions backfills operator-specific conditions
 // that may be missing after an upgrade from an older version.
 func EnsureNUMAResourcesOperatorConditions(conditions []metav1.Condition) []metav1.Condition {
 	now := time.Now()
 	for _, cond := range operatorExtraConditions(now) {
-		if metahelper.FindStatusCondition(conditions, cond.Type) == nil {
+		if FindCondition(conditions, cond.Type) == nil {
 			conditions = append(conditions, cond)
 		}
 	}

test/e2e/serial/tests/configuration.go

@@ -325,7 +325,7 @@ var _ = Describe("[serial][disruptive] numaresources configuration management",
 			updatedOperObj := &nropv1.NUMAResourcesOperator{}
 			Eventually(func(g Gomega) {
 				g.Expect(fxt.Client.Get(ctx, nroKey, updatedOperObj)).To(Succeed())
-				g.Expect(isNROOperSyncedAt(&updatedOperObj.Status, status.ConditionAvailable, updatedOperObj.Generation)).To(Succeed())
+				g.Expect(isNROOperSyncedAt(&updatedOperObj.Status, status.ConditionAvailable, updatedOperObj.Generation)).To(BeTrue())
 			}).WithTimeout(10 * time.Minute).WithPolling(30 * time.Second).Should(Succeed())
 
 			By("verifying DaemonSet count matches NodeGroup count")
@@ -1592,6 +1592,20 @@ func isNROSchedUpToDate(nros *nropv1.NUMAResourcesScheduler) bool {
 	return isNROSchedAvailableAt(&nros.Status, nros.Generation)
 }
 
+func isNROOperSyncedAt(nropStatus *nropv1.NUMAResourcesOperatorStatus, conditionType string, gen int64) bool {
+	if nropStatus == nil {
+		return false
+	}
+	cond := status.FindCondition(nropStatus.Conditions, conditionType)
+	if cond == nil {
+		return false
+	}
+	if cond.Status != metav1.ConditionTrue {
+		return false
+	}
+	return cond.ObservedGeneration == gen
+}
+
 func isNROOperAvailableAt(nropStatus *nropv1.NUMAResourcesOperatorStatus, gen int64) bool {
 	if nropStatus == nil {
 		return false