From f31d88e5ce5371ed926e2ceda54a6efdecaea59d Mon Sep 17 00:00:00 2001 From: Tim Ramlot <42113979+inteon@users.noreply.github.com> Date: Mon, 20 Nov 2023 17:55:18 +0100 Subject: [PATCH] replace k8s.io/utils/pointer with k8s.io/utils/ptr Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- pkg/builder/controller_test.go | 4 ++-- pkg/cache/cache.go | 4 ++-- pkg/cache/cache_test.go | 6 +++--- pkg/cache/defaulting_test.go | 12 ++++++------ pkg/client/client_test.go | 10 +++------- pkg/client/dryrun_test.go | 4 ++-- pkg/client/options_test.go | 8 ++++---- pkg/controller/controller_test.go | 16 ++++++++-------- pkg/controller/controllerutil/controllerutil.go | 6 +++--- .../controllerutil/controllerutil_test.go | 4 ++-- pkg/envtest/crd.go | 4 ++-- pkg/envtest/komega/default.go | 2 +- pkg/envtest/komega/default_test.go | 6 +++--- pkg/envtest/komega/interfaces.go | 2 +- pkg/envtest/komega/komega_test.go | 8 ++++---- pkg/handler/eventhandler_test.go | 6 +++--- pkg/internal/controller/controller_test.go | 4 ++-- pkg/manager/manager.go | 4 ++-- pkg/manager/runnable_group_test.go | 4 ++-- pkg/metrics/filters/filters_test.go | 4 ++-- 22 files changed, 60 insertions(+), 64 deletions(-) diff --git a/go.mod b/go.mod index 28ee637d68..351ba69a71 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( k8s.io/client-go v0.28.3 k8s.io/component-base v0.28.3 k8s.io/klog/v2 v2.110.1 - k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 + k8s.io/utils v0.0.0-20230726121419-3b25d923346b sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index be514df5a9..a1c116269a 100644 --- a/go.sum +++ b/go.sum @@ -644,8 +644,8 @@ k8s.io/kms v0.28.3 h1:jYwwAe96XELNjYWv1G4kNzizcFoZ50OOElvPansbw70= k8s.io/kms v0.28.3/go.mod h1:kSMjU2tg7vjqqoWVVCcmPmNZ/CofPsoTbSxAipCvZuE= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= -k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk= -k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/pkg/builder/controller_test.go b/pkg/builder/controller_test.go index a70ece37c4..dd6ac679fd 100644 --- a/pkg/builder/controller_test.go +++ b/pkg/builder/controller_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/rest" "k8s.io/client-go/util/workqueue" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" @@ -668,7 +668,7 @@ func doReconcileTest(ctx context.Context, nameSuffix string, mgr manager.Manager Name: deployName, Kind: "Deployment", APIVersion: "apps/v1", - Controller: pointer.Bool(true), + Controller: ptr.To(true), UID: dep.UID, }, }, diff --git a/pkg/cache/cache.go b/pkg/cache/cache.go index b6b989e146..cbc1ee586f 100644 --- a/pkg/cache/cache.go +++ b/pkg/cache/cache.go @@ -33,7 +33,7 @@ import ( "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" toolscache "k8s.io/client-go/tools/cache" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/cache/internal" "sigs.k8s.io/controller-runtime/pkg/client" @@ -381,7 +381,7 @@ func newCache(restConfig *rest.Config, opts Options) newCacheFunc { }, Transform: config.Transform, WatchErrorHandler: opts.DefaultWatchErrorHandler, - UnsafeDisableDeepCopy: pointer.BoolDeref(config.UnsafeDisableDeepCopy, false), + UnsafeDisableDeepCopy: ptr.Deref(config.UnsafeDisableDeepCopy, false), NewInformer: opts.newInformer, }), readerFailOnMissingInformer: opts.ReaderFailOnMissingInformer, diff --git a/pkg/cache/cache_test.go b/pkg/cache/cache_test.go index 17c64a73c1..cfe0856a1e 100644 --- a/pkg/cache/cache_test.go +++ b/pkg/cache/cache_test.go @@ -40,7 +40,7 @@ import ( kscheme "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" kcache "k8s.io/client-go/tools/cache" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" @@ -146,10 +146,10 @@ var _ = Describe("Multi-Namespace Informer Cache", func() { var _ = Describe("Informer Cache without global DeepCopy", func() { CacheTest(cache.New, cache.Options{ - DefaultUnsafeDisableDeepCopy: pointer.Bool(true), + DefaultUnsafeDisableDeepCopy: ptr.To(true), }) NonBlockingGetTest(cache.New, cache.Options{ - DefaultUnsafeDisableDeepCopy: pointer.Bool(true), + DefaultUnsafeDisableDeepCopy: ptr.To(true), }) }) diff --git a/pkg/cache/defaulting_test.go b/pkg/cache/defaulting_test.go index 6cbde247c3..bb5e6ca083 100644 --- a/pkg/cache/defaulting_test.go +++ b/pkg/cache/defaulting_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -187,23 +187,23 @@ func TestDefaultOpts(t *testing.T) { name: "ByObject.UnsafeDisableDeepCopy gets defaulted from DefaultUnsafeDisableDeepCopy", in: Options{ ByObject: map[client.Object]ByObject{pod: {}}, - DefaultUnsafeDisableDeepCopy: pointer.Bool(true), + DefaultUnsafeDisableDeepCopy: ptr.To(true), }, verification: func(o Options) string { - expected := pointer.Bool(true) + expected := ptr.To(true) return cmp.Diff(expected, o.ByObject[pod].UnsafeDisableDeepCopy) }, }, { name: "ByObject.UnsafeDisableDeepCopy doesn't get defaulted when set", in: Options{ - ByObject: map[client.Object]ByObject{pod: {UnsafeDisableDeepCopy: pointer.Bool(false)}}, - DefaultUnsafeDisableDeepCopy: pointer.Bool(true), + ByObject: map[client.Object]ByObject{pod: {UnsafeDisableDeepCopy: ptr.To(false)}}, + DefaultUnsafeDisableDeepCopy: ptr.To(true), }, verification: func(o Options) string { - expected := pointer.Bool(false) + expected := ptr.To(false) return cmp.Diff(expected, o.ByObject[pod].UnsafeDisableDeepCopy) }, }, diff --git a/pkg/client/client_test.go b/pkg/client/client_test.go index 2a491cec67..07d57c36ee 100644 --- a/pkg/client/client_test.go +++ b/pkg/client/client_test.go @@ -41,7 +41,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" kscheme "k8s.io/client-go/kubernetes/scheme" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/examples/crd/pkg" "sigs.k8s.io/controller-runtime/pkg/cache" @@ -391,7 +391,7 @@ U5wwSivyi7vmegHKmblOzNVKA5qPO8zWzqBC Context("with the DryRun option", func() { It("should not create a new object, global option", func() { - cl, err := client.New(cfg, client.Options{DryRun: pointer.Bool(true)}) + cl, err := client.New(cfg, client.Options{DryRun: ptr.To(true)}) Expect(err).NotTo(HaveOccurred()) Expect(cl).NotTo(BeNil()) @@ -843,7 +843,7 @@ U5wwSivyi7vmegHKmblOzNVKA5qPO8zWzqBC By("Creating the eviction") eviction := &policyv1.Eviction{ - DeleteOptions: &metav1.DeleteOptions{GracePeriodSeconds: ptr(int64(0))}, + DeleteOptions: &metav1.DeleteOptions{GracePeriodSeconds: ptr.To(int64(0))}, } err = cl.SubResource("eviction").Create(ctx, pod, eviction) Expect((err)).NotTo(HaveOccurred()) @@ -3965,10 +3965,6 @@ func (f *fakeUncachedReader) List(_ context.Context, _ client.ObjectList, _ ...c return &cache.ErrResourceNotCached{} } -func ptr[T any](to T) *T { - return &to -} - func toUnstructured(o client.Object) (*unstructured.Unstructured, error) { serialized, err := json.Marshal(o) if err != nil { diff --git a/pkg/client/dryrun_test.go b/pkg/client/dryrun_test.go index 72907fefab..0d370e0576 100644 --- a/pkg/client/dryrun_test.go +++ b/pkg/client/dryrun_test.go @@ -28,7 +28,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -41,7 +41,7 @@ var _ = Describe("DryRunClient", func() { ctx := context.Background() getClient := func() client.Client { - cl, err := client.New(cfg, client.Options{DryRun: pointer.Bool(true)}) + cl, err := client.New(cfg, client.Options{DryRun: ptr.To(true)}) Expect(err).NotTo(HaveOccurred()) Expect(cl).NotTo(BeNil()) return cl diff --git a/pkg/client/options_test.go b/pkg/client/options_test.go index 8a90c14dda..c6dc09b676 100644 --- a/pkg/client/options_test.go +++ b/pkg/client/options_test.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" - utilpointer "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -112,7 +112,7 @@ var _ = Describe("CreateOptions", func() { var _ = Describe("DeleteOptions", func() { It("Should set GracePeriodSeconds", func() { - o := &client.DeleteOptions{GracePeriodSeconds: utilpointer.Int64(42)} + o := &client.DeleteOptions{GracePeriodSeconds: ptr.To(int64(42))} newDeleteOpts := &client.DeleteOptions{} o.ApplyToDelete(newDeleteOpts) Expect(newDeleteOpts).To(Equal(o)) @@ -185,7 +185,7 @@ var _ = Describe("PatchOptions", func() { Expect(newPatchOpts).To(Equal(o)) }) It("Should set Force", func() { - o := &client.PatchOptions{Force: utilpointer.Bool(true)} + o := &client.PatchOptions{Force: ptr.To(true)} newPatchOpts := &client.PatchOptions{} o.ApplyToPatch(newPatchOpts) Expect(newPatchOpts).To(Equal(o)) @@ -218,7 +218,7 @@ var _ = Describe("DeleteAllOfOptions", func() { Expect(newDeleteAllOfOpts).To(Equal(o)) }) It("Should set DeleleteOptions", func() { - o := &client.DeleteAllOfOptions{DeleteOptions: client.DeleteOptions{GracePeriodSeconds: utilpointer.Int64(44)}} + o := &client.DeleteAllOfOptions{DeleteOptions: client.DeleteOptions{GracePeriodSeconds: ptr.To(int64(44))}} newDeleteAllOfOpts := &client.DeleteAllOfOptions{} o.ApplyToDeleteAllOf(newDeleteAllOfOpts) Expect(newDeleteAllOfOpts).To(Equal(o)) diff --git a/pkg/controller/controller_test.go b/pkg/controller/controller_test.go index b75ed1a4e4..e49a2c5774 100644 --- a/pkg/controller/controller_test.go +++ b/pkg/controller/controller_test.go @@ -24,7 +24,7 @@ import ( . "github.com/onsi/gomega" "go.uber.org/goleak" corev1 "k8s.io/api/core/v1" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/config" "sigs.k8s.io/controller-runtime/pkg/controller" @@ -134,7 +134,7 @@ var _ = Describe("controller.Controller", func() { }) It("should default RecoverPanic from the manager", func() { - m, err := manager.New(cfg, manager.Options{Controller: config.Controller{RecoverPanic: pointer.Bool(true)}}) + m, err := manager.New(cfg, manager.Options{Controller: config.Controller{RecoverPanic: ptr.To(true)}}) Expect(err).NotTo(HaveOccurred()) c, err := controller.New("new-controller", m, controller.Options{ @@ -150,11 +150,11 @@ var _ = Describe("controller.Controller", func() { }) It("should not override RecoverPanic on the controller", func() { - m, err := manager.New(cfg, manager.Options{Controller: config.Controller{RecoverPanic: pointer.Bool(true)}}) + m, err := manager.New(cfg, manager.Options{Controller: config.Controller{RecoverPanic: ptr.To(true)}}) Expect(err).NotTo(HaveOccurred()) c, err := controller.New("new-controller", m, controller.Options{ - RecoverPanic: pointer.Bool(false), + RecoverPanic: ptr.To(false), Reconciler: reconcile.Func(nil), }) Expect(err).NotTo(HaveOccurred()) @@ -167,7 +167,7 @@ var _ = Describe("controller.Controller", func() { }) It("should default NeedLeaderElection from the manager", func() { - m, err := manager.New(cfg, manager.Options{Controller: config.Controller{NeedLeaderElection: pointer.Bool(true)}}) + m, err := manager.New(cfg, manager.Options{Controller: config.Controller{NeedLeaderElection: ptr.To(true)}}) Expect(err).NotTo(HaveOccurred()) c, err := controller.New("new-controller", m, controller.Options{ @@ -182,11 +182,11 @@ var _ = Describe("controller.Controller", func() { }) It("should not override NeedLeaderElection on the controller", func() { - m, err := manager.New(cfg, manager.Options{Controller: config.Controller{NeedLeaderElection: pointer.Bool(true)}}) + m, err := manager.New(cfg, manager.Options{Controller: config.Controller{NeedLeaderElection: ptr.To(true)}}) Expect(err).NotTo(HaveOccurred()) c, err := controller.New("new-controller", m, controller.Options{ - NeedLeaderElection: pointer.Bool(false), + NeedLeaderElection: ptr.To(false), Reconciler: reconcile.Func(nil), }) Expect(err).NotTo(HaveOccurred()) @@ -309,7 +309,7 @@ var _ = Describe("controller.Controller", func() { Expect(err).NotTo(HaveOccurred()) c, err := controller.New("new-controller", m, controller.Options{ - NeedLeaderElection: pointer.Bool(false), + NeedLeaderElection: ptr.To(false), Reconciler: rec, }) Expect(err).NotTo(HaveOccurred()) diff --git a/pkg/controller/controllerutil/controllerutil.go b/pkg/controller/controllerutil/controllerutil.go index ab0bcf7a59..7b10d78582 100644 --- a/pkg/controller/controllerutil/controllerutil.go +++ b/pkg/controller/controllerutil/controllerutil.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/apiutil" @@ -77,8 +77,8 @@ func SetControllerReference(owner, controlled metav1.Object, scheme *runtime.Sch Kind: gvk.Kind, Name: owner.GetName(), UID: owner.GetUID(), - BlockOwnerDeletion: pointer.Bool(true), - Controller: pointer.Bool(true), + BlockOwnerDeletion: ptr.To(true), + Controller: ptr.To(true), } // Return early with an error if the object is already controlled. diff --git a/pkg/controller/controllerutil/controllerutil_test.go b/pkg/controller/controllerutil/controllerutil_test.go index 69d8c6d221..7e9d9f96c4 100644 --- a/pkg/controller/controllerutil/controllerutil_test.go +++ b/pkg/controller/controllerutil/controllerutil_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) @@ -733,7 +733,7 @@ var _ = Describe("Controllerutil", func() { assertLocalDeployWasUpdated(nil) op, err = controllerutil.CreateOrPatch(context.TODO(), c, deploy, func() error { - deploy.Spec.Replicas = pointer.Int32(5) + deploy.Spec.Replicas = ptr.To(int32(5)) deploy.Status.Conditions = []appsv1.DeploymentCondition{{ Type: appsv1.DeploymentProgressing, Status: corev1.ConditionTrue, diff --git a/pkg/envtest/crd.go b/pkg/envtest/crd.go index 43abea35f6..5fdd657cd7 100644 --- a/pkg/envtest/crd.go +++ b/pkg/envtest/crd.go @@ -38,7 +38,7 @@ import ( "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "k8s.io/client-go/util/retry" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "sigs.k8s.io/yaml" "sigs.k8s.io/controller-runtime/pkg/client" @@ -364,7 +364,7 @@ func modifyConversionWebhooks(crds []*apiextensionsv1.CustomResourceDefinition, if err != nil { return err } - url := pointer.String(fmt.Sprintf("https://%s/convert", hostPort)) + url := ptr.To(fmt.Sprintf("https://%s/convert", hostPort)) for i := range crds { // Continue if we're preserving unknown fields. diff --git a/pkg/envtest/komega/default.go b/pkg/envtest/komega/default.go index 48fb927a20..9652c19762 100644 --- a/pkg/envtest/komega/default.go +++ b/pkg/envtest/komega/default.go @@ -83,7 +83,7 @@ func UpdateStatus(obj client.Object, f func(), opts ...client.SubResourceUpdateO // It can be used with gomega.Eventually() like this: // // deployment := appsv1.Deployment{ ... } -// gomega.Eventually(k.Object(&deployment)).To(HaveField("Spec.Replicas", gomega.Equal(pointer.Int32(3)))) +// gomega.Eventually(k.Object(&deployment)).To(HaveField("Spec.Replicas", gomega.Equal(ptr.To(3)))) // // By calling the returned function directly it can also be used as gomega.Expect(k.Object(...)()).To(...) func Object(obj client.Object) func() (client.Object, error) { diff --git a/pkg/envtest/komega/default_test.go b/pkg/envtest/komega/default_test.go index 238a4abd9e..1a1de72cf3 100644 --- a/pkg/envtest/komega/default_test.go +++ b/pkg/envtest/komega/default_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" ) func TestDefaultGet(t *testing.T) { @@ -95,7 +95,7 @@ func TestDefaultObject(t *testing.T) { } g.Eventually(Object(&fetched)).Should(And( Not(BeNil()), - HaveField("Spec.Replicas", Equal(pointer.Int32(5))), + HaveField("Spec.Replicas", Equal(ptr.To(int32(5)))), )) } @@ -110,7 +110,7 @@ func TestDefaultObjectList(t *testing.T) { Not(BeNil()), HaveField("Items", And( HaveLen(1), - ContainElement(HaveField("Spec.Replicas", Equal(pointer.Int32(5)))), + ContainElement(HaveField("Spec.Replicas", Equal(ptr.To(int32(5))))), )), )) } diff --git a/pkg/envtest/komega/interfaces.go b/pkg/envtest/komega/interfaces.go index 6f7e5db35b..1fbd38dbfc 100644 --- a/pkg/envtest/komega/interfaces.go +++ b/pkg/envtest/komega/interfaces.go @@ -62,7 +62,7 @@ type Komega interface { // Object returns a function that fetches a resource and returns the object. // It can be used with gomega.Eventually() like this: // deployment := appsv1.Deployment{ ... } - // gomega.Eventually(k.Object(&deployment)).To(HaveField("Spec.Replicas", gomega.Equal(pointer.Int32(3)))) + // gomega.Eventually(k.Object(&deployment)).To(HaveField("Spec.Replicas", gomega.Equal(ptr.To(int32(3))))) // By calling the returned function directly it can also be used as gomega.Expect(k.Object(...)()).To(...) Object(client.Object) func() (client.Object, error) diff --git a/pkg/envtest/komega/komega_test.go b/pkg/envtest/komega/komega_test.go index 275610c8bb..8867ac239a 100644 --- a/pkg/envtest/komega/komega_test.go +++ b/pkg/envtest/komega/komega_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake" @@ -20,7 +20,7 @@ func exampleDeployment() *appsv1.Deployment { Name: "test", }, Spec: appsv1.DeploymentSpec{ - Replicas: pointer.Int32(5), + Replicas: ptr.To(int32(5)), }, } } @@ -117,7 +117,7 @@ func TestObject(t *testing.T) { } g.Eventually(k.Object(&fetched)).Should(And( Not(BeNil()), - HaveField("Spec.Replicas", Equal(pointer.Int32(5))), + HaveField("Spec.Replicas", Equal(ptr.To(int32(5)))), )) } @@ -132,7 +132,7 @@ func TestObjectList(t *testing.T) { Not(BeNil()), HaveField("Items", And( HaveLen(1), - ContainElement(HaveField("Spec.Replicas", Equal(pointer.Int32(5)))), + ContainElement(HaveField("Spec.Replicas", Equal(ptr.To(int32(5))))), )), )) } diff --git a/pkg/handler/eventhandler_test.go b/pkg/handler/eventhandler_test.go index e433219e81..4743e748c6 100644 --- a/pkg/handler/eventhandler_test.go +++ b/pkg/handler/eventhandler_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "k8s.io/client-go/util/workqueue" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/apiutil" "sigs.k8s.io/controller-runtime/pkg/controller/controllertest" @@ -525,7 +525,7 @@ var _ = Describe("Eventhandler", func() { Name: "foo2-parent", Kind: "ReplicaSet", APIVersion: "apps/v1", - Controller: pointer.Bool(true), + Controller: ptr.To(true), }, { Name: "foo3-parent", @@ -536,7 +536,7 @@ var _ = Describe("Eventhandler", func() { Name: "foo4-parent", Kind: "ReplicaSet", APIVersion: "apps/v1", - Controller: pointer.Bool(true), + Controller: ptr.To(true), }, { Name: "foo5-parent", diff --git a/pkg/internal/controller/controller_test.go b/pkg/internal/controller/controller_test.go index 9575af69b8..ce2245e60f 100644 --- a/pkg/internal/controller/controller_test.go +++ b/pkg/internal/controller/controller_test.go @@ -33,7 +33,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/workqueue" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/cache/informertest" "sigs.k8s.io/controller-runtime/pkg/client" @@ -111,7 +111,7 @@ var _ = Describe("controller", func() { defer func() { Expect(recover()).To(BeNil()) }() - ctrl.RecoverPanic = pointer.Bool(true) + ctrl.RecoverPanic = ptr.To(true) ctrl.Do = reconcile.Func(func(context.Context, reconcile.Request) (reconcile.Result, error) { var res *reconcile.Result return *res, nil diff --git a/pkg/manager/manager.go b/pkg/manager/manager.go index 67cc0c4786..25c3c7375b 100644 --- a/pkg/manager/manager.go +++ b/pkg/manager/manager.go @@ -34,7 +34,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/leaderelection/resourcelock" "k8s.io/client-go/tools/record" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/cache" @@ -412,7 +412,7 @@ func New(config *rest.Config, options Options) (Manager, error) { errChan := make(chan error, 1) runnables := newRunnables(options.BaseContext, errChan) return &controllerManager{ - stopProcedureEngaged: pointer.Int64(0), + stopProcedureEngaged: ptr.To(int64(0)), cluster: cluster, runnables: runnables, errChan: errChan, diff --git a/pkg/manager/runnable_group_test.go b/pkg/manager/runnable_group_test.go index 251ce46fb3..9a55c4de9e 100644 --- a/pkg/manager/runnable_group_test.go +++ b/pkg/manager/runnable_group_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/cache/informertest" "sigs.k8s.io/controller-runtime/pkg/webhook" ) @@ -112,7 +112,7 @@ var _ = Describe("runnableGroup", func() { It("should be able to close the group and wait for all runnables to finish", func() { ctx, cancel := context.WithCancel(context.Background()) - exited := pointer.Int64(0) + exited := ptr.To(int64(0)) rg := newRunnableGroup(defaultBaseContext, errCh) for i := 0; i < 10; i++ { Expect(rg.Add(RunnableFunc(func(c context.Context) error { diff --git a/pkg/metrics/filters/filters_test.go b/pkg/metrics/filters/filters_test.go index 31074f55f4..e47d79d621 100644 --- a/pkg/metrics/filters/filters_test.go +++ b/pkg/metrics/filters/filters_test.go @@ -34,7 +34,7 @@ import ( rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/rest" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/metrics" @@ -260,7 +260,7 @@ func setupServiceAccountForURL(ctx context.Context, c client.Client, path string tokenRequest := &authenticationv1.TokenRequest{ Spec: authenticationv1.TokenRequestSpec{ - ExpirationSeconds: pointer.Int64(2 * 60 * 60), // 2 hours. + ExpirationSeconds: ptr.To(int64(2 * 60 * 60)), // 2 hours. }, } if err := c.SubResource("token").Create(ctx, sa, tokenRequest); err != nil {