Update code for controller-runtime 0.16.0

Minor changes

Author: justinsb

examples/guestbook-operator/main.go

@@ -30,6 +30,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/addon"
 
 	addonsv1alpha1 "sigs.k8s.io/kubebuilder-declarative-pattern/examples/guestbook-operator/api/v1alpha1"
@@ -68,9 +69,10 @@ func main() {
 	addon.Init()
 
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
-		Scheme:                 scheme,
-		MetricsBindAddress:     metricsAddr,
-		Port:                   9443,
+		Scheme: scheme,
+		Metrics: metricsserver.Options{
+			BindAddress: "0", // Disable the metrics server
+		},
 		HealthProbeBindAddress: probeAddr,
 		LeaderElection:         enableLeaderElection,
 		LeaderElectionID:       "c3cffa1a.example.org",

pkg/patterns/declarative/metrics_test.go

@@ -38,12 +38,14 @@ import (
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+	"sigs.k8s.io/yaml"
+
 	"sigs.k8s.io/kubebuilder-declarative-pattern/applylib/applyset"
 	"sigs.k8s.io/kubebuilder-declarative-pattern/mockkubeapiserver"
 	"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/declarative/pkg/applier"
 	"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/declarative/pkg/manifest"
-	"sigs.k8s.io/yaml"
 )
 
 func fakeParent() runtime.Object {
@@ -276,7 +278,9 @@ func TestAddIfNotPresent(t *testing.T) {
 
 	// Create manager
 	mgrOpt := manager.Options{
-		MetricsBindAddress: "0", // Don't open unneeded ports
+		Metrics: metricsserver.Options{
+			BindAddress: "0", // Disable the metrics server, don't open unneeded ports
+		},
 	}
 	mgr, err := manager.New(restConfig, mgrOpt)
 	if err != nil {

pkg/patterns/declarative/pkg/applier/direct.go

@@ -11,6 +11,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
@@ -135,8 +136,8 @@ func (d *DirectApplier) Apply(ctx context.Context, opt ApplierOptions) error {
 	printFlags := genericclioptions.NewPrintFlags("apply")
 	applyOpts := &apply.ApplyOptions{
 		Recorder:            &genericclioptions.NoopRecorder{},
-		VisitedUids:         sets.NewString(),
-		VisitedNamespaces:   sets.NewString(),
+		VisitedUids:         sets.New[types.UID](),
+		VisitedNamespaces:   sets.New[string](),
 		PrintFlags:          printFlags,
 		IOStreams:           ioStreams,
 		FieldManager:        "kubectl-client-side-apply",

pkg/test/testreconciler/simpletest/controller_test.go

@@ -13,12 +13,13 @@ import (
 	"k8s.io/klog/v2"
 	"k8s.io/klog/v2/klogr"
 	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/restmapper"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	"sigs.k8s.io/kubebuilder-declarative-pattern/mockkubeapiserver"
 	"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/addon/pkg/loaders"
 	"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/declarative"
 	"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/declarative/pkg/applier"
+	"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/restmapper"
 	"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/test/httprecorder"
 	"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/test/testharness"
 
@@ -68,10 +69,11 @@ func testSimpleReconciler(h *testharness.Harness, testdir string, applier applie
 
 	logger := klogr.New()
 	mgr, err := ctrl.NewManager(restConfig, ctrl.Options{
-		Scheme:             scheme,
-		MetricsBindAddress: "",
-		Port:               0,
-		LeaderElection:     false,
+		Scheme: scheme,
+		Metrics: metricsserver.Options{
+			BindAddress: "0", // Disable the metrics server
+		},
+		LeaderElection: false,
 
 		// MapperProvider provides the rest mapper used to map go types to Kubernetes APIs
 		MapperProvider: restmapper.NewControllerRESTMapper,