update tests for 1.30 kubernetes chages

this includes
* updating for controller-runtime
* updating location of openshift/api manifests for tests
* update Makefile for envtest version and gcs bucket flag

Author: elmiko

Makefile

@@ -3,7 +3,7 @@
 IMG ?= controller:latest
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.29
+ENVTEST_K8S_VERSION = 1.30.1
 
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
 CONTROLLER_GEN = go run ${PROJECT_DIR}/vendor/sigs.k8s.io/controller-tools/cmd/controller-gen
@@ -34,7 +34,7 @@ verify: fmt vet lint
 test: generate verify manifests unit
 
 unit:
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path --bin-dir $(PROJECT_DIR)/bin --remote-bucket openshift-kubebuilder-tools)" ./hack/ci-test.sh
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --use-deprecated-gcs=true -p path --bin-dir $(PROJECT_DIR)/bin --remote-bucket openshift-kubebuilder-tools)" ./hack/ci-test.sh
 
 # Build operator binaries
 build: operator config-sync-controllers azure-config-credentials-injector

pkg/controllers/clusteroperator_controller.go

@@ -205,7 +205,7 @@ func (r *CloudOperatorReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Watches(&operatorv1.KubeControllerManager{},
 			handler.EnqueueRequestsFromMapFunc(toClusterOperator),
 			builder.WithPredicates(kcmPredicates())).
-		WatchesRawSource(&source.Channel{Source: watcher.EventStream()}, handler.EnqueueRequestsFromMapFunc(toClusterOperator)).
+		WatchesRawSource(source.Channel(watcher.EventStream(), handler.EnqueueRequestsFromMapFunc(toClusterOperator))).
 		Watches(&corev1.ConfigMap{}, handler.EnqueueRequestsFromMapFunc(toClusterOperator)).
 		Watches(&corev1.Secret{}, handler.EnqueueRequestsFromMapFunc(toClusterOperator))
 

pkg/controllers/clusteroperator_controller_test.go

@@ -600,7 +600,7 @@ var _ = Describe("Apply resources should", func() {
 			Eventually(func() bool {
 				err := cl.Delete(context.Background(), co)
 				return err == nil || apierrors.IsNotFound(err)
-			}).Should(BeTrue())
+			}, timeout).Should(BeTrue())
 		}
 		Eventually(apierrors.IsNotFound(cl.Get(context.Background(), client.ObjectKey{Name: clusterOperatorName}, co))).Should(BeTrue())
 

pkg/controllers/resourceapply/resourceapply.go

@@ -17,6 +17,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/klog/v2"
+	"k8s.io/utils/ptr"
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	coreclientv1 "sigs.k8s.io/controller-runtime/pkg/client"
@@ -105,7 +106,7 @@ func applyConfigMap(ctx context.Context, client coreclientv1.Client, recorder re
 		return false, err
 	}
 
-	modified := resourcemerge.BoolPtr(false)
+	modified := ptr.To[bool](false)
 	existingCopy := existing.DeepCopy()
 
 	resourcemerge.EnsureObjectMeta(modified, &existingCopy.ObjectMeta, required.ObjectMeta)
@@ -178,7 +179,7 @@ func applyDeployment(ctx context.Context, client coreclientv1.Client, recorder r
 		return false, err
 	}
 
-	modified := resourcemerge.BoolPtr(false)
+	modified := ptr.To[bool](false)
 	existingCopy := existing.DeepCopy()
 
 	expectedGeneration := ""
@@ -267,7 +268,7 @@ func applyDaemonSet(ctx context.Context, client coreclientv1.Client, recorder re
 		return false, err
 	}
 
-	modified := resourcemerge.BoolPtr(false)
+	modified := ptr.To[bool](false)
 	existingCopy := existing.DeepCopy()
 
 	expectedGeneration := ""
@@ -347,7 +348,7 @@ func applyPodDisruptionBudget(ctx context.Context, client coreclientv1.Client, r
 		return false, fmt.Errorf("failed to get pdb for update: %v", err)
 	}
 
-	modified := resourcemerge.BoolPtr(false)
+	modified := ptr.To[bool](false)
 	existingCopy := existing.DeepCopy()
 
 	resourcemerge.EnsureObjectMeta(modified, &existingCopy.ObjectMeta, required.ObjectMeta)
@@ -387,7 +388,7 @@ func applyRole(ctx context.Context, client coreclientv1.Client, recorder record.
 		return false, fmt.Errorf("failed to get role for update: %v", err)
 	}
 
-	modified := resourcemerge.BoolPtr(false)
+	modified := ptr.To[bool](false)
 	existingCopy := existing.DeepCopy()
 
 	resourcemerge.EnsureObjectMeta(modified, &existingCopy.ObjectMeta, required.ObjectMeta)
@@ -425,7 +426,7 @@ func applyClusterRole(ctx context.Context, client coreclientv1.Client, recorder
 		return false, fmt.Errorf("failed to get clusterrole for update: %v", err)
 	}
 
-	modified := resourcemerge.BoolPtr(false)
+	modified := ptr.To[bool](false)
 	existingCopy := existing.DeepCopy()
 
 	resourcemerge.EnsureObjectMeta(modified, &existingCopy.ObjectMeta, required.ObjectMeta)
@@ -464,7 +465,7 @@ func applyRoleBinding(ctx context.Context, client coreclientv1.Client, recorder
 		return false, fmt.Errorf("failed to get rolebinding for update: %v", err)
 	}
 
-	modified := resourcemerge.BoolPtr(false)
+	modified := ptr.To[bool](false)
 	existingCopy := existing.DeepCopy()
 	requiredCopy := required.DeepCopy()
 
@@ -521,7 +522,7 @@ func applyClusterRoleBinding(ctx context.Context, client coreclientv1.Client, re
 		return false, fmt.Errorf("failed to get clusterrolebinding for update: %v", err)
 	}
 
-	modified := resourcemerge.BoolPtr(false)
+	modified := ptr.To[bool](false)
 	existingCopy := existing.DeepCopy()
 	requiredCopy := required.DeepCopy()
 

pkg/controllers/suite_test.go

@@ -74,8 +74,8 @@ var _ = BeforeSuite(func() {
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
 		CRDDirectoryPaths: []string{
-			filepath.Join("../..", "vendor", "github.com", "openshift", "api", "config", "v1"),
-			filepath.Join("../..", "vendor", "github.com", "openshift", "api", "operator", "v1"),
+			filepath.Join("../..", "vendor", "github.com", "openshift", "api", "config", "v1", "zz_generated.crd-manifests"),
+			filepath.Join("../..", "vendor", "github.com", "openshift", "api", "operator", "v1", "zz_generated.crd-manifests"),
 		},
 	}