updating methods to comply with k8 1.30

Signed-off-by: Adam D. Cornett <[email protected]>
operator-framework · Oct 17, 2024 · 108ec1b · 108ec1b
1 parent a6ff0a6
commit 108ec1b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/internal/ansible/controller/controller.go b/internal/ansible/controller/controller.go
@@ -26,6 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
@@ -125,7 +126,7 @@ func Add(mgr manager.Manager, options Options) *controller.Controller {
 
 	u := &unstructured.Unstructured{}
 	u.SetGroupVersionKind(options.GVK)
-	err = c.Watch(source.Kind(mgr.GetCache(), u), handler.LoggingEnqueueRequestForObject{}, predicates...)
+	err = c.Watch(source.Kind(mgr.GetCache(), client.Object(u), handler.LoggingEnqueueRequestForObject{}, predicates...))
 	if err != nil {
 		log.Error(err, "")
 		os.Exit(1)

diff --git a/internal/ansible/handler/logging_enqueue_annotation.go b/internal/ansible/handler/logging_enqueue_annotation.go
@@ -31,7 +31,7 @@ import (
 //
 //	&handler.LoggingEnqueueRequestForAnnotation{}
 type LoggingEnqueueRequestForAnnotation struct {
-	handler.EnqueueRequestForAnnotation
+	handler.EnqueueRequestForAnnotation[client.Object]
 }
 
 // Create implements EventHandler, and emits a log message.

diff --git a/internal/ansible/handler/logging_enqueue_object.go b/internal/ansible/handler/logging_enqueue_object.go
@@ -30,7 +30,7 @@ var log = logf.Log.WithName("ansible").WithName("handler")
 //
 //	&handler.LoggingEnqueueRequestForObject{}
 type LoggingEnqueueRequestForObject struct {
-	handler.InstrumentedEnqueueRequestForObject
+	handler.InstrumentedEnqueueRequestForObject[client.Object]
 }
 
 // Create implements EventHandler, and emits a log message.
@@ -54,7 +54,7 @@ func (h LoggingEnqueueRequestForObject) Delete(ctx context.Context, e event.Dele
 // Generic implements EventHandler, and emits a log message.
 func (h LoggingEnqueueRequestForObject) Generic(ctx context.Context, e event.GenericEvent, q workqueue.RateLimitingInterface) {
 	h.logEvent("Generic", e.Object)
-	h.EnqueueRequestForObject.Generic(ctx, e, q)
+	h.InstrumentedEnqueueRequestForObject.Generic(ctx, e, q)
 }
 
 func (h LoggingEnqueueRequestForObject) logEvent(eventType string, object client.Object) {

diff --git a/internal/ansible/proxy/proxy.go b/internal/ansible/proxy/proxy.go
@@ -37,6 +37,7 @@ import (
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	"github.com/operator-framework/ansible-operator-plugins/internal/ansible/handler"
@@ -238,9 +239,9 @@ func addWatchToController(owner kubeconfig.NamespacedOwnerReference, cMap *contr
 			owMap.Store(resource.GroupVersionKind())
 			log.Info("Watching child resource", "kind", resource.GroupVersionKind(),
 				"enqueue_kind", u.GroupVersionKind())
-			err := contents.Controller.Watch(source.Kind(cache, resource),
+			err := contents.Controller.Watch(source.Kind(cache, client.Object(resource),
 				handler.EnqueueRequestForOwnerWithLogging(scheme, restMapper, u),
-				predicate.DependentPredicate{})
+				predicate.DependentPredicate{}))
 			// Store watch in map
 			if err != nil {
 				log.Error(err, "Failed to watch child resource",
@@ -260,9 +261,9 @@ func addWatchToController(owner kubeconfig.NamespacedOwnerReference, cMap *contr
 			}
 			log.Info("Watching child resource", "kind", resource.GroupVersionKind(),
 				"enqueue_annotation_type", ownerGK.String())
-			err = contents.Controller.Watch(source.Kind(cache, resource), &handler.LoggingEnqueueRequestForAnnotation{
-				EnqueueRequestForAnnotation: libhandler.EnqueueRequestForAnnotation{Type: ownerGK},
-			}, predicate.DependentPredicate{})
+			err = contents.Controller.Watch(source.Kind(cache, client.Object(resource), &handler.LoggingEnqueueRequestForAnnotation{
+				EnqueueRequestForAnnotation: libhandler.EnqueueRequestForAnnotation[client.Object]{Type: ownerGK},
+			}, predicate.DependentPredicate{}))
 			if err != nil {
 				log.Error(err, "Failed to watch child resource",
 					"kind", resource.GroupVersionKind(), "enqueue_kind", u.GroupVersionKind())