Merge pull request #380 from slintes/update-deps

Update OCP / K8s dependencies and tool versions

Author: openshift-merge-bot[bot]

Makefile

@@ -6,13 +6,13 @@ OPERATOR_SDK_VERSION = v1.33.0
 # https://pkg.go.dev/github.com/operator-framework/operator-registry?tab=versions
 OPM_VERSION = v1.56.0
 # https://pkg.go.dev/sigs.k8s.io/controller-tools?tab=versions
-CONTROLLER_GEN_VERSION = v0.18.0
+CONTROLLER_GEN_VERSION = v0.17.3
 # update for major version updates to KUSTOMIZE_VERSION!
 KUSTOMIZE_API_VERSION = v5
 # https://pkg.go.dev/sigs.k8s.io/kustomize/kustomize/v5?tab=versions
 KUSTOMIZE_VERSION = v5.3.0
 # https://pkg.go.dev/sigs.k8s.io/controller-runtime/tools/setup-envtest/env?tab=versions
-ENVTEST_VERSION = v0.0.0-20240123110158-b88ed7a3602b
+ENVTEST_VERSION = v0.0.0-20250813191507-c7df6d0236ed
 # https://pkg.go.dev/golang.org/x/tools/cmd/goimports?tab=versions
 GOIMPORTS_VERSION = v0.36.0
 # https://pkg.go.dev/github.com/slintes/sort-imports?tab=versions
@@ -22,7 +22,7 @@ YQ_API_VERSION = v4
 YQ_VERSION = v4.47.1
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.28
+ENVTEST_K8S_VERSION = 1.32
 
 # VERSION defines the project version for the bundle.
 # Update this value when you upgrade the version of your project.

bundle/manifests/remediation.medik8s.io_nodehealthchecks.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.17.3
   creationTimestamp: null
   labels:
     app.kubernetes.io/name: node-healthcheck-operator
@@ -256,11 +256,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string

config/crd/bases/remediation.medik8s.io_nodehealthchecks.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.17.3
   name: nodehealthchecks.remediation.medik8s.io
 spec:
   group: remediation.medik8s.io
@@ -254,11 +254,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string

controllers/cluster/capabilities.go

@@ -69,10 +69,7 @@ func NewCapabilities(config *rest.Config, reader client.Reader, logger logr.Logg
 		// see https://github.com/openshift/api/blob/c1fdeb0788c16659238d93ec45ce2e798c14eb88/config/v1/types_infrastructure.go#L129-L147
 		if cpTopology == configv1.HighlyAvailableTopologyMode ||
 			cpTopology == configv1.SingleReplicaTopologyMode ||
-			// quick fix without updating openshift/api dependency, it would need too many other updates
-			// see https://github.com/openshift/api/blob/017e9dd0276e4ed0242a759dffd419d728337876/config/v1/types_infrastructure.go#L142
-			// update to const once deps are updated
-			cpTopology == "HighlyAvailableArbiter" ||
+			cpTopology == configv1.HighlyAvailableArbiterMode ||
 			cpTopology == configv1.ExternalTopologyMode {
 
 			logger.Info("supported control plane topology", "topology", cpTopology)

controllers/featuregates/accessor.go

@@ -13,10 +13,11 @@ import (
 
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
+	"k8s.io/utils/clock"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 
-	osconfigv1 "github.com/openshift/api/config/v1"
+	osfeatures "github.com/openshift/api/features"
 	osclientset "github.com/openshift/client-go/config/clientset/versioned"
 	configinformersv1 "github.com/openshift/client-go/config/informers/externalversions"
 	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
@@ -81,7 +82,7 @@ func (fga *accessor) Start(ctx context.Context) error {
 	clusterVersionsInformer := configSharedInformer.Config().V1().ClusterVersions()
 	featureGatesInformer := configSharedInformer.Config().V1().FeatureGates()
 
-	recorder := events.NewLoggingEventRecorder("accessor")
+	recorder := events.NewLoggingEventRecorder("accessor", clock.RealClock{})
 
 	// using the same version for desiredVersion and missingVersion will let the accessor just use
 	// the current deployed version, which is what we want...
@@ -123,7 +124,7 @@ func (fga *accessor) featureGateChanged(fc featuregates.FeatureChange) {
 	defer fga.isMaoMhcDisabledLock.Unlock()
 
 	for _, fg := range fc.New.Enabled {
-		if fg == osconfigv1.FeatureGateMachineAPIOperatorDisableMachineHealthCheckController {
+		if fg == osfeatures.FeatureGateMachineAPIOperatorDisableMachineHealthCheckController {
 			if !fga.isMaoMhcDisabled {
 				fga.isMaoMhcDisabled = true
 				fga.log.Info("MachineAPIOperatorDisableMachineHealthCheckController feature gate is enabled")

controllers/initializer/suite_test.go

@@ -37,6 +37,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	consolev1 "github.com/openshift/api/console/v1"
+	_ "github.com/openshift/api/console/v1/zz_generated.crd-manifests"
 
 	remediationv1alpha1 "github.com/medik8s/node-healthcheck-operator/api/v1alpha1"
 )
@@ -67,7 +68,7 @@ var _ = BeforeSuite(func() {
 	testEnv = &envtest.Environment{
 		CRDInstallOptions: envtest.CRDInstallOptions{
 			Paths: []string{
-				filepath.Join("..", "..", "vendor", "github.com", "openshift", "api", "console", "v1alpha1"),
+				filepath.Join("..", "..", "vendor", "github.com", "openshift", "api", "console", "v1", "zz_generated.crd-manifests", "90_consoleplugins.crd.yaml"),
 				filepath.Join("..", "..", "config", "crd", "bases"),
 			},
 			ErrorIfPathMissing: true,

controllers/machinehealthcheck_controller.go

@@ -94,8 +94,8 @@ func (r *MachineHealthCheckReconciler) SetupWithManager(mgr ctrl.Manager) error
 		handler.EnqueueRequestsFromMapFunc(utils.MHCByMachineMapperFunc(mgr.GetClient(), mgr.GetLogger(), r.FeatureGates)),
 	)
 	bldr = bldr.WatchesRawSource(
-		&source.Channel{Source: r.FeatureGateMHCControllerEvents},
-		handler.EnqueueRequestsFromMapFunc(utils.MHCByFeatureGateEventMapperFunc(mgr.GetClient(), mgr.GetLogger(), r.FeatureGates)),
+		source.Channel(r.FeatureGateMHCControllerEvents,
+			handler.EnqueueRequestsFromMapFunc(utils.MHCByFeatureGateEventMapperFunc(mgr.GetClient(), mgr.GetLogger(), r.FeatureGates))),
 	)
 
 	if controller, err := bldr.Build(r); err == nil {

controllers/machinehealthcheck_controller_test.go

@@ -166,7 +166,7 @@ func TestReconcile(t *testing.T) {
 				ExpectedMachines:    pointer.Int(1),
 				CurrentHealthy:      pointer.Int(0),
 				RemediationsAllowed: 0,
-				Conditions: machinev1.Conditions{
+				Conditions: []machinev1.Condition{
 					remediationAllowedCondition,
 				},
 			},
@@ -197,7 +197,7 @@ func TestReconcile(t *testing.T) {
 				ExpectedMachines:    pointer.Int(1),
 				CurrentHealthy:      pointer.Int(1),
 				RemediationsAllowed: 1,
-				Conditions: machinev1.Conditions{
+				Conditions: []machinev1.Condition{
 					remediationAllowedCondition,
 				},
 			},
@@ -219,7 +219,7 @@ func TestReconcile(t *testing.T) {
 				ExpectedMachines:    pointer.Int(1),
 				CurrentHealthy:      pointer.Int(0),
 				RemediationsAllowed: 0,
-				Conditions: machinev1.Conditions{
+				Conditions: []machinev1.Condition{
 					remediationAllowedCondition,
 				},
 			},
@@ -238,7 +238,7 @@ func TestReconcile(t *testing.T) {
 				ExpectedMachines:    pointer.Int(0),
 				CurrentHealthy:      pointer.Int(0),
 				RemediationsAllowed: 0,
-				Conditions: machinev1.Conditions{
+				Conditions: []machinev1.Condition{
 					remediationAllowedCondition,
 				},
 			},
@@ -257,7 +257,7 @@ func TestReconcile(t *testing.T) {
 				ExpectedMachines:    pointer.Int(0),
 				CurrentHealthy:      pointer.Int(0),
 				RemediationsAllowed: 0,
-				Conditions: machinev1.Conditions{
+				Conditions: []machinev1.Condition{
 					remediationAllowedCondition,
 				},
 			},
@@ -276,7 +276,7 @@ func TestReconcile(t *testing.T) {
 				ExpectedMachines:    pointer.Int(1),
 				CurrentHealthy:      pointer.Int(0),
 				RemediationsAllowed: 0,
-				Conditions: machinev1.Conditions{
+				Conditions: []machinev1.Condition{
 					remediationAllowedCondition,
 				},
 			},
@@ -297,7 +297,7 @@ func TestReconcile(t *testing.T) {
 				ExpectedMachines:    pointer.Int(1),
 				CurrentHealthy:      pointer.Int(0),
 				RemediationsAllowed: 0,
-				Conditions: machinev1.Conditions{
+				Conditions: []machinev1.Condition{
 					remediationAllowedCondition,
 				},
 			},
@@ -316,7 +316,7 @@ func TestReconcile(t *testing.T) {
 				ExpectedMachines:    pointer.Int(1),
 				CurrentHealthy:      pointer.Int(0),
 				RemediationsAllowed: 0,
-				Conditions: machinev1.Conditions{
+				Conditions: []machinev1.Condition{
 					remediationAllowedCondition,
 				},
 			},
@@ -335,7 +335,7 @@ func TestReconcile(t *testing.T) {
 				ExpectedMachines:    pointer.Int(1),
 				CurrentHealthy:      pointer.Int(1),
 				RemediationsAllowed: 0,
-				Conditions: machinev1.Conditions{
+				Conditions: []machinev1.Condition{
 					remediationAllowedCondition,
 				},
 			},
@@ -356,7 +356,7 @@ func TestReconcile(t *testing.T) {
 				ExpectedMachines:    pointer.Int(1),
 				CurrentHealthy:      pointer.Int(0),
 				RemediationsAllowed: 0,
-				Conditions: machinev1.Conditions{
+				Conditions: []machinev1.Condition{
 					{
 						Type:     machinev1.RemediationAllowedCondition,
 						Status:   corev1.ConditionFalse,
@@ -419,7 +419,7 @@ func TestReconcileExternalRemediationTemplate(t *testing.T) {
 				ExpectedMachines:    pointer.Int(1),
 				CurrentHealthy:      pointer.Int(1),
 				RemediationsAllowed: 1,
-				Conditions: machinev1.Conditions{
+				Conditions: []machinev1.Condition{
 					remediationAllowedCondition,
 				},
 			},
@@ -441,7 +441,7 @@ func TestReconcileExternalRemediationTemplate(t *testing.T) {
 				ExpectedMachines:    pointer.Int(1),
 				CurrentHealthy:      pointer.Int(0),
 				RemediationsAllowed: 0,
-				Conditions: machinev1.Conditions{
+				Conditions: []machinev1.Condition{
 					remediationAllowedCondition,
 				},
 			},
@@ -463,7 +463,7 @@ func TestReconcileExternalRemediationTemplate(t *testing.T) {
 				ExpectedMachines:    pointer.Int(1),
 				CurrentHealthy:      pointer.Int(0),
 				RemediationsAllowed: 0,
-				Conditions: machinev1.Conditions{
+				Conditions: []machinev1.Condition{
 					remediationAllowedCondition,
 				},
 			},
@@ -485,7 +485,7 @@ func TestReconcileExternalRemediationTemplate(t *testing.T) {
 				ExpectedMachines:    pointer.Int(1),
 				CurrentHealthy:      pointer.Int(0),
 				RemediationsAllowed: 0,
-				Conditions: machinev1.Conditions{
+				Conditions: []machinev1.Condition{
 					remediationAllowedCondition,
 				},
 			},

controllers/nodehealthcheck_controller.go

@@ -109,8 +109,8 @@ func (r *NodeHealthCheckReconciler) SetupWithManager(mgr ctrl.Manager) error {
 			),
 		).
 		WatchesRawSource(
-			&source.Channel{Source: r.MHCEvents},
-			handler.EnqueueRequestsFromMapFunc(utils.NHCByMHCEventMapperFunc(mgr.GetClient(), mgr.GetLogger())),
+			source.Channel(r.MHCEvents,
+				handler.EnqueueRequestsFromMapFunc(utils.NHCByMHCEventMapperFunc(mgr.GetClient(), mgr.GetLogger()))),
 		).
 		Build(r)
 

controllers/resources/watch.go

@@ -1,6 +1,7 @@
 package resources
 
 import (
+	"context"
 	"sync"
 
 	"github.com/go-logr/logr"
@@ -13,6 +14,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	"github.com/openshift/api/machine/v1beta1"
@@ -103,16 +105,24 @@ func (wm *watchManager) addRemediationTemplateCRWatch(templateCR *unstructured.U
 		mapperFunc = utils.MHCByRemediationTemplateCRMapperFunc(wm.client, wm.log)
 	}
 
-	if err := wm.controller.Watch(
-		source.Kind(wm.cache, templateCR),
-		handler.EnqueueRequestsFromMapFunc(mapperFunc),
-		predicate.Funcs{
-			// we are just interested in update and delete events for now
-			// template CR updates: validate
-			// template CR deletion: update NHC/MHC status
-			CreateFunc:  func(_ event.CreateEvent) bool { return false },
-			GenericFunc: func(_ event.GenericEvent) bool { return false },
+	// Create typed handler using the mapper function
+	typedHandler := handler.TypedEnqueueRequestsFromMapFunc[*unstructured.Unstructured](
+		func(ctx context.Context, obj *unstructured.Unstructured) []reconcile.Request {
+			return mapperFunc(ctx, obj)
 		},
+	)
+
+	if err := wm.controller.Watch(
+		source.Kind(wm.cache, templateCR,
+			typedHandler,
+			predicate.TypedFuncs[*unstructured.Unstructured]{
+				// we are just interested in update and delete events for now
+				// template CR updates: validate
+				// template CR deletion: update NHC/MHC status
+				CreateFunc:  func(_ event.TypedCreateEvent[*unstructured.Unstructured]) bool { return false },
+				GenericFunc: func(_ event.TypedGenericEvent[*unstructured.Unstructured]) bool { return false },
+			},
+		),
 	); err != nil {
 		return err
 	}
@@ -130,16 +140,25 @@ func (wm *watchManager) addRemediationCRWatch(remediationCR *unstructured.Unstru
 		return nil
 	}
 
-	if err := wm.controller.Watch(
-		source.Kind(wm.cache, remediationCR),
-		handler.EnqueueRequestsFromMapFunc(utils.RemediationCRMapperFunc(wm.log, watchType)),
-		predicate.Funcs{
-			// we are just interested in update and delete events for now
-			// remediation CR update: watch conditions
-			// remediation CR deletion: clean up
-			CreateFunc:  func(_ event.CreateEvent) bool { return false },
-			GenericFunc: func(_ event.GenericEvent) bool { return false },
+	// Create typed handler using the mapper function
+	mapperFunc := utils.RemediationCRMapperFunc(wm.log, watchType)
+	typedHandler := handler.TypedEnqueueRequestsFromMapFunc[*unstructured.Unstructured](
+		func(ctx context.Context, obj *unstructured.Unstructured) []reconcile.Request {
+			return mapperFunc(ctx, obj)
 		},
+	)
+
+	if err := wm.controller.Watch(
+		source.Kind(wm.cache, remediationCR,
+			typedHandler,
+			predicate.TypedFuncs[*unstructured.Unstructured]{
+				// we are just interested in update and delete events for now
+				// remediation CR update: watch conditions
+				// remediation CR deletion: clean up
+				CreateFunc:  func(_ event.TypedCreateEvent[*unstructured.Unstructured]) bool { return false },
+				GenericFunc: func(_ event.TypedGenericEvent[*unstructured.Unstructured]) bool { return false },
+			},
+		),
 	); err != nil {
 		return err
 	}