refactor: replace code with features now available in c-r

Ref. kubernetes-sigs/controller-runtime#2054 and kubernetes-sigs/controller-runtime#2031
statnett · Jan 9, 2023 · 4a3f127 · 4a3f127
1 parent c662723
commit 4a3f127
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 53 deletions.
diff --git a/controllers/predicates.go b/controllers/predicates.go
@@ -106,21 +106,3 @@ var jobIsFinished = predicate.NewPredicateFuncs(func(object client.Object) bool
 var cisVulnerabilityOverflow = predicate.NewPredicateFuncs(func(object client.Object) bool {
 	return object.(*stasv1alpha1.ContainerImageScan).HasVulnerabilityOverflow()
 })
-
-// TODO: Replace with new func added to c-r in https://github.com/kubernetes-sigs/controller-runtime/pull/2031
-func notPredicate(p predicate.Predicate) predicate.Predicate {
-	return predicate.Funcs{
-		CreateFunc: func(event event.CreateEvent) bool {
-			return !p.Create(event)
-		},
-		DeleteFunc: func(event event.DeleteEvent) bool {
-			return !p.Delete(event)
-		},
-		UpdateFunc: func(event event.UpdateEvent) bool {
-			return !p.Update(event)
-		},
-		GenericFunc: func(event event.GenericEvent) bool {
-			return !p.Generic(event)
-		},
-	}
-}
diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -18,14 +18,14 @@ import (
 	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/cluster"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 	"sigs.k8s.io/controller-runtime/pkg/envtest/komega"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	stasv1alpha1 "github.com/statnett/image-scanner-operator/api/v1alpha1"
-	"github.com/statnett/image-scanner-operator/internal/cluster"
 	"github.com/statnett/image-scanner-operator/internal/pod"
 	"github.com/statnett/image-scanner-operator/pkg/operator"
 	//+kubebuilder:scaffold:imports
@@ -90,7 +90,7 @@ var _ = BeforeSuite(func() {
 	}
 
 	k8sManager, err := ctrl.NewManager(cfg, ctrl.Options{
-		NewClient: cluster.NewCachingClient,
+		NewClient: cluster.ClientBuilderWithOptions(cluster.ClientOptions{CacheUnstructured: true}),
 		Scheme:    scheme.Scheme,
 	})
 	Expect(err).NotTo(HaveOccurred())

diff --git a/controllers/workload_controller.go b/controllers/workload_controller.go
@@ -69,8 +69,8 @@ func (r *PodReconciler) SetupWithManager(mgr ctrl.Manager) error {
 				ignoreDeletionPredicate(),
 			)).
 		WithEventFilter(predicate.And(
-			notPredicate(systemNamespace),
-			notPredicate(managedByImageScanner),
+			predicate.Not(systemNamespace),
+			predicate.Not(managedByImageScanner),
 		)).
 		Watches(&source.Kind{Type: &stasv1alpha1.ContainerImageScan{}},
 			&handler.EnqueueRequestForOwner{OwnerType: &corev1.Pod{}},

diff --git a/internal/cluster/cache_unstructured.go b/internal/cluster/cache_unstructured.go
diff --git a/main.go b/main.go
@@ -18,11 +18,11 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
+	"sigs.k8s.io/controller-runtime/pkg/cluster"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 
 	stasv1alpha1 "github.com/statnett/image-scanner-operator/api/v1alpha1"
 	"github.com/statnett/image-scanner-operator/controllers"
-	"github.com/statnett/image-scanner-operator/internal/cluster"
 	"github.com/statnett/image-scanner-operator/internal/metrics"
 	"github.com/statnett/image-scanner-operator/internal/pod"
 	"github.com/statnett/image-scanner-operator/internal/resources"
@@ -96,7 +96,7 @@ func main() {
 	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
 
 	options := ctrl.Options{
-		NewClient:              cluster.NewCachingClient,
+		NewClient:              cluster.ClientBuilderWithOptions(cluster.ClientOptions{CacheUnstructured: true}),
 		Scheme:                 scheme,
 		MetricsBindAddress:     metricsAddr,
 		Port:                   9443,