Skip to content

Commit 53cd67b

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2488 from inteon/upgrade_dependencies
✨Replace k8s.io/utils/pointer with k8s.io/utils/ptr
2 parents b81fc66 + 3ddde48 commit 53cd67b

24 files changed

+64
-67
lines changed

‎examples/scratch-env/go.sum

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2018,8 +2018,9 @@ k8s.io/kms v0.28.3/go.mod h1:kSMjU2tg7vjqqoWVVCcmPmNZ/CofPsoTbSxAipCvZuE=
20182018
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ=
20192019
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
20202020
k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
2021-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
20222021
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
2022+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
2023+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
20232024
lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
20242025
lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
20252026
modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ require (
2626
k8s.io/client-go v0.28.3
2727
k8s.io/component-base v0.28.3
2828
k8s.io/klog/v2 v2.110.1
29-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
29+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
3030
sigs.k8s.io/yaml v1.4.0
3131
)
3232

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -644,8 +644,8 @@ k8s.io/kms v0.28.3 h1:jYwwAe96XELNjYWv1G4kNzizcFoZ50OOElvPansbw70=
644644
k8s.io/kms v0.28.3/go.mod h1:kSMjU2tg7vjqqoWVVCcmPmNZ/CofPsoTbSxAipCvZuE=
645645
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ=
646646
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
647-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
648-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
647+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
648+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
649649
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
650650
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
651651
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

‎pkg/builder/controller_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"k8s.io/apimachinery/pkg/types"
3434
"k8s.io/client-go/rest"
3535
"k8s.io/client-go/util/workqueue"
36-
"k8s.io/utils/pointer"
36+
"k8s.io/utils/ptr"
3737

3838
"sigs.k8s.io/controller-runtime/pkg/cache"
3939
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -668,7 +668,7 @@ func doReconcileTest(ctx context.Context, nameSuffix string, mgr manager.Manager
668668
Name: deployName,
669669
Kind: "Deployment",
670670
APIVersion: "apps/v1",
671-
Controller: pointer.Bool(true),
671+
Controller: ptr.To(true),
672672
UID: dep.UID,
673673
},
674674
},

‎pkg/cache/cache.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"k8s.io/client-go/kubernetes/scheme"
3434
"k8s.io/client-go/rest"
3535
toolscache "k8s.io/client-go/tools/cache"
36-
"k8s.io/utils/pointer"
36+
"k8s.io/utils/ptr"
3737

3838
"sigs.k8s.io/controller-runtime/pkg/cache/internal"
3939
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -381,7 +381,7 @@ func newCache(restConfig *rest.Config, opts Options) newCacheFunc {
381381
},
382382
Transform: config.Transform,
383383
WatchErrorHandler: opts.DefaultWatchErrorHandler,
384-
UnsafeDisableDeepCopy: pointer.BoolDeref(config.UnsafeDisableDeepCopy, false),
384+
UnsafeDisableDeepCopy: ptr.Deref(config.UnsafeDisableDeepCopy, false),
385385
NewInformer: opts.newInformer,
386386
}),
387387
readerFailOnMissingInformer: opts.ReaderFailOnMissingInformer,

‎pkg/cache/cache_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import (
4040
kscheme "k8s.io/client-go/kubernetes/scheme"
4141
"k8s.io/client-go/rest"
4242
kcache "k8s.io/client-go/tools/cache"
43-
"k8s.io/utils/pointer"
43+
"k8s.io/utils/ptr"
4444

4545
"sigs.k8s.io/controller-runtime/pkg/cache"
4646
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -146,10 +146,10 @@ var _ = Describe("Multi-Namespace Informer Cache", func() {
146146

147147
var _ = Describe("Informer Cache without global DeepCopy", func() {
148148
CacheTest(cache.New, cache.Options{
149-
DefaultUnsafeDisableDeepCopy: pointer.Bool(true),
149+
DefaultUnsafeDisableDeepCopy: ptr.To(true),
150150
})
151151
NonBlockingGetTest(cache.New, cache.Options{
152-
DefaultUnsafeDisableDeepCopy: pointer.Bool(true),
152+
DefaultUnsafeDisableDeepCopy: ptr.To(true),
153153
})
154154
})
155155

‎pkg/cache/defaulting_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"k8s.io/apimachinery/pkg/runtime/schema"
3131
"k8s.io/client-go/rest"
3232
"k8s.io/client-go/tools/cache"
33-
"k8s.io/utils/pointer"
33+
"k8s.io/utils/ptr"
3434
"sigs.k8s.io/controller-runtime/pkg/client"
3535
)
3636

@@ -187,23 +187,23 @@ func TestDefaultOpts(t *testing.T) {
187187
name: "ByObject.UnsafeDisableDeepCopy gets defaulted from DefaultUnsafeDisableDeepCopy",
188188
in: Options{
189189
ByObject: map[client.Object]ByObject{pod: {}},
190-
DefaultUnsafeDisableDeepCopy: pointer.Bool(true),
190+
DefaultUnsafeDisableDeepCopy: ptr.To(true),
191191
},
192192

193193
verification: func(o Options) string {
194-
expected := pointer.Bool(true)
194+
expected := ptr.To(true)
195195
return cmp.Diff(expected, o.ByObject[pod].UnsafeDisableDeepCopy)
196196
},
197197
},
198198
{
199199
name: "ByObject.UnsafeDisableDeepCopy doesn't get defaulted when set",
200200
in: Options{
201-
ByObject: map[client.Object]ByObject{pod: {UnsafeDisableDeepCopy: pointer.Bool(false)}},
202-
DefaultUnsafeDisableDeepCopy: pointer.Bool(true),
201+
ByObject: map[client.Object]ByObject{pod: {UnsafeDisableDeepCopy: ptr.To(false)}},
202+
DefaultUnsafeDisableDeepCopy: ptr.To(true),
203203
},
204204

205205
verification: func(o Options) string {
206-
expected := pointer.Bool(false)
206+
expected := ptr.To(false)
207207
return cmp.Diff(expected, o.ByObject[pod].UnsafeDisableDeepCopy)
208208
},
209209
},

‎pkg/client/client_test.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import (
4141
"k8s.io/apimachinery/pkg/runtime/schema"
4242
"k8s.io/apimachinery/pkg/types"
4343
kscheme "k8s.io/client-go/kubernetes/scheme"
44-
"k8s.io/utils/pointer"
44+
"k8s.io/utils/ptr"
4545

4646
"sigs.k8s.io/controller-runtime/examples/crd/pkg"
4747
"sigs.k8s.io/controller-runtime/pkg/cache"
@@ -391,7 +391,7 @@ U5wwSivyi7vmegHKmblOzNVKA5qPO8zWzqBC
391391

392392
Context("with the DryRun option", func() {
393393
It("should not create a new object, global option", func() {
394-
cl, err := client.New(cfg, client.Options{DryRun: pointer.Bool(true)})
394+
cl, err := client.New(cfg, client.Options{DryRun: ptr.To(true)})
395395
Expect(err).NotTo(HaveOccurred())
396396
Expect(cl).NotTo(BeNil())
397397

@@ -843,7 +843,7 @@ U5wwSivyi7vmegHKmblOzNVKA5qPO8zWzqBC
843843

844844
By("Creating the eviction")
845845
eviction := &policyv1.Eviction{
846-
DeleteOptions: &metav1.DeleteOptions{GracePeriodSeconds: ptr(int64(0))},
846+
DeleteOptions: &metav1.DeleteOptions{GracePeriodSeconds: ptr.To(int64(0))},
847847
}
848848
err = cl.SubResource("eviction").Create(ctx, pod, eviction)
849849
Expect((err)).NotTo(HaveOccurred())
@@ -3965,10 +3965,6 @@ func (f *fakeUncachedReader) List(_ context.Context, _ client.ObjectList, _ ...c
39653965
return &cache.ErrResourceNotCached{}
39663966
}
39673967

3968-
func ptr[T any](to T) *T {
3969-
return &to
3970-
}
3971-
39723968
func toUnstructured(o client.Object) (*unstructured.Unstructured, error) {
39733969
serialized, err := json.Marshal(o)
39743970
if err != nil {

‎pkg/client/dryrun_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
apierrors "k8s.io/apimachinery/pkg/api/errors"
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3030
"k8s.io/apimachinery/pkg/types"
31-
"k8s.io/utils/pointer"
31+
"k8s.io/utils/ptr"
3232

3333
"sigs.k8s.io/controller-runtime/pkg/client"
3434
)
@@ -41,7 +41,7 @@ var _ = Describe("DryRunClient", func() {
4141
ctx := context.Background()
4242

4343
getClient := func() client.Client {
44-
cl, err := client.New(cfg, client.Options{DryRun: pointer.Bool(true)})
44+
cl, err := client.New(cfg, client.Options{DryRun: ptr.To(true)})
4545
Expect(err).NotTo(HaveOccurred())
4646
Expect(cl).NotTo(BeNil())
4747
return cl

‎pkg/client/fake/client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import (
4040
"k8s.io/apimachinery/pkg/types"
4141
"k8s.io/apimachinery/pkg/watch"
4242
"k8s.io/client-go/kubernetes/fake"
43-
"k8s.io/utils/pointer"
43+
"k8s.io/utils/ptr"
4444

4545
"sigs.k8s.io/controller-runtime/pkg/client"
4646
"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
@@ -1610,7 +1610,7 @@ var _ = Describe("Fake client", func() {
16101610
objOriginal.APIVersion = actual.APIVersion
16111611
objOriginal.Kind = actual.Kind
16121612
objOriginal.ResourceVersion = actual.ResourceVersion
1613-
objOriginal.Spec.Replicas = pointer.Int32(2)
1613+
objOriginal.Spec.Replicas = ptr.To(int32(2))
16141614
Expect(cmp.Diff(objOriginal, actual)).To(BeEmpty())
16151615
})
16161616

‎pkg/client/options_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2424
"k8s.io/apimachinery/pkg/fields"
2525
"k8s.io/apimachinery/pkg/labels"
26-
utilpointer "k8s.io/utils/pointer"
26+
"k8s.io/utils/ptr"
2727
"sigs.k8s.io/controller-runtime/pkg/client"
2828
)
2929

@@ -112,7 +112,7 @@ var _ = Describe("CreateOptions", func() {
112112

113113
var _ = Describe("DeleteOptions", func() {
114114
It("Should set GracePeriodSeconds", func() {
115-
o := &client.DeleteOptions{GracePeriodSeconds: utilpointer.Int64(42)}
115+
o := &client.DeleteOptions{GracePeriodSeconds: ptr.To(int64(42))}
116116
newDeleteOpts := &client.DeleteOptions{}
117117
o.ApplyToDelete(newDeleteOpts)
118118
Expect(newDeleteOpts).To(Equal(o))
@@ -185,7 +185,7 @@ var _ = Describe("PatchOptions", func() {
185185
Expect(newPatchOpts).To(Equal(o))
186186
})
187187
It("Should set Force", func() {
188-
o := &client.PatchOptions{Force: utilpointer.Bool(true)}
188+
o := &client.PatchOptions{Force: ptr.To(true)}
189189
newPatchOpts := &client.PatchOptions{}
190190
o.ApplyToPatch(newPatchOpts)
191191
Expect(newPatchOpts).To(Equal(o))
@@ -218,7 +218,7 @@ var _ = Describe("DeleteAllOfOptions", func() {
218218
Expect(newDeleteAllOfOpts).To(Equal(o))
219219
})
220220
It("Should set DeleleteOptions", func() {
221-
o := &client.DeleteAllOfOptions{DeleteOptions: client.DeleteOptions{GracePeriodSeconds: utilpointer.Int64(44)}}
221+
o := &client.DeleteAllOfOptions{DeleteOptions: client.DeleteOptions{GracePeriodSeconds: ptr.To(int64(44))}}
222222
newDeleteAllOfOpts := &client.DeleteAllOfOptions{}
223223
o.ApplyToDeleteAllOf(newDeleteAllOfOpts)
224224
Expect(newDeleteAllOfOpts).To(Equal(o))

‎pkg/controller/controller_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
. "github.com/onsi/gomega"
2525
"go.uber.org/goleak"
2626
corev1 "k8s.io/api/core/v1"
27-
"k8s.io/utils/pointer"
27+
"k8s.io/utils/ptr"
2828

2929
"sigs.k8s.io/controller-runtime/pkg/config"
3030
"sigs.k8s.io/controller-runtime/pkg/controller"
@@ -134,7 +134,7 @@ var _ = Describe("controller.Controller", func() {
134134
})
135135

136136
It("should default RecoverPanic from the manager", func() {
137-
m, err := manager.New(cfg, manager.Options{Controller: config.Controller{RecoverPanic: pointer.Bool(true)}})
137+
m, err := manager.New(cfg, manager.Options{Controller: config.Controller{RecoverPanic: ptr.To(true)}})
138138
Expect(err).NotTo(HaveOccurred())
139139

140140
c, err := controller.New("new-controller", m, controller.Options{
@@ -150,11 +150,11 @@ var _ = Describe("controller.Controller", func() {
150150
})
151151

152152
It("should not override RecoverPanic on the controller", func() {
153-
m, err := manager.New(cfg, manager.Options{Controller: config.Controller{RecoverPanic: pointer.Bool(true)}})
153+
m, err := manager.New(cfg, manager.Options{Controller: config.Controller{RecoverPanic: ptr.To(true)}})
154154
Expect(err).NotTo(HaveOccurred())
155155

156156
c, err := controller.New("new-controller", m, controller.Options{
157-
RecoverPanic: pointer.Bool(false),
157+
RecoverPanic: ptr.To(false),
158158
Reconciler: reconcile.Func(nil),
159159
})
160160
Expect(err).NotTo(HaveOccurred())
@@ -167,7 +167,7 @@ var _ = Describe("controller.Controller", func() {
167167
})
168168

169169
It("should default NeedLeaderElection from the manager", func() {
170-
m, err := manager.New(cfg, manager.Options{Controller: config.Controller{NeedLeaderElection: pointer.Bool(true)}})
170+
m, err := manager.New(cfg, manager.Options{Controller: config.Controller{NeedLeaderElection: ptr.To(true)}})
171171
Expect(err).NotTo(HaveOccurred())
172172

173173
c, err := controller.New("new-controller", m, controller.Options{
@@ -182,11 +182,11 @@ var _ = Describe("controller.Controller", func() {
182182
})
183183

184184
It("should not override NeedLeaderElection on the controller", func() {
185-
m, err := manager.New(cfg, manager.Options{Controller: config.Controller{NeedLeaderElection: pointer.Bool(true)}})
185+
m, err := manager.New(cfg, manager.Options{Controller: config.Controller{NeedLeaderElection: ptr.To(true)}})
186186
Expect(err).NotTo(HaveOccurred())
187187

188188
c, err := controller.New("new-controller", m, controller.Options{
189-
NeedLeaderElection: pointer.Bool(false),
189+
NeedLeaderElection: ptr.To(false),
190190
Reconciler: reconcile.Func(nil),
191191
})
192192
Expect(err).NotTo(HaveOccurred())
@@ -309,7 +309,7 @@ var _ = Describe("controller.Controller", func() {
309309
Expect(err).NotTo(HaveOccurred())
310310

311311
c, err := controller.New("new-controller", m, controller.Options{
312-
NeedLeaderElection: pointer.Bool(false),
312+
NeedLeaderElection: ptr.To(false),
313313
Reconciler: rec,
314314
})
315315
Expect(err).NotTo(HaveOccurred())

‎pkg/controller/controllerutil/controllerutil.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2828
"k8s.io/apimachinery/pkg/runtime"
2929
"k8s.io/apimachinery/pkg/runtime/schema"
30-
"k8s.io/utils/pointer"
30+
"k8s.io/utils/ptr"
3131

3232
"sigs.k8s.io/controller-runtime/pkg/client"
3333
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
@@ -77,8 +77,8 @@ func SetControllerReference(owner, controlled metav1.Object, scheme *runtime.Sch
7777
Kind: gvk.Kind,
7878
Name: owner.GetName(),
7979
UID: owner.GetUID(),
80-
BlockOwnerDeletion: pointer.Bool(true),
81-
Controller: pointer.Bool(true),
80+
BlockOwnerDeletion: ptr.To(true),
81+
Controller: ptr.To(true),
8282
}
8383

8484
// Return early with an error if the object is already controlled.

‎pkg/controller/controllerutil/controllerutil_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"k8s.io/apimachinery/pkg/runtime"
3131
"k8s.io/apimachinery/pkg/types"
3232
"k8s.io/client-go/kubernetes/scheme"
33-
"k8s.io/utils/pointer"
33+
"k8s.io/utils/ptr"
3434
"sigs.k8s.io/controller-runtime/pkg/client"
3535
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
3636
)
@@ -733,7 +733,7 @@ var _ = Describe("Controllerutil", func() {
733733
assertLocalDeployWasUpdated(nil)
734734

735735
op, err = controllerutil.CreateOrPatch(context.TODO(), c, deploy, func() error {
736-
deploy.Spec.Replicas = pointer.Int32(5)
736+
deploy.Spec.Replicas = ptr.To(int32(5))
737737
deploy.Status.Conditions = []appsv1.DeploymentCondition{{
738738
Type: appsv1.DeploymentProgressing,
739739
Status: corev1.ConditionTrue,

‎pkg/envtest/crd.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
"k8s.io/client-go/kubernetes/scheme"
3939
"k8s.io/client-go/rest"
4040
"k8s.io/client-go/util/retry"
41-
"k8s.io/utils/pointer"
41+
"k8s.io/utils/ptr"
4242
"sigs.k8s.io/yaml"
4343

4444
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -364,7 +364,7 @@ func modifyConversionWebhooks(crds []*apiextensionsv1.CustomResourceDefinition,
364364
if err != nil {
365365
return err
366366
}
367-
url := pointer.String(fmt.Sprintf("https://%s/convert", hostPort))
367+
url := ptr.To(fmt.Sprintf("https://%s/convert", hostPort))
368368

369369
for i := range crds {
370370
// Continue if we're preserving unknown fields.

‎pkg/envtest/komega/default.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func UpdateStatus(obj client.Object, f func(), opts ...client.SubResourceUpdateO
8383
// It can be used with gomega.Eventually() like this:
8484
//
8585
// deployment := appsv1.Deployment{ ... }
86-
// gomega.Eventually(k.Object(&deployment)).To(HaveField("Spec.Replicas", gomega.Equal(pointer.Int32(3))))
86+
// gomega.Eventually(k.Object(&deployment)).To(HaveField("Spec.Replicas", gomega.Equal(ptr.To(3))))
8787
//
8888
// By calling the returned function directly it can also be used as gomega.Expect(k.Object(...)()).To(...)
8989
func Object(obj client.Object) func() (client.Object, error) {

‎pkg/envtest/komega/default_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
. "github.com/onsi/gomega"
77
appsv1 "k8s.io/api/apps/v1"
88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
9-
"k8s.io/utils/pointer"
9+
"k8s.io/utils/ptr"
1010
)
1111

1212
func TestDefaultGet(t *testing.T) {
@@ -95,7 +95,7 @@ func TestDefaultObject(t *testing.T) {
9595
}
9696
g.Eventually(Object(&fetched)).Should(And(
9797
Not(BeNil()),
98-
HaveField("Spec.Replicas", Equal(pointer.Int32(5))),
98+
HaveField("Spec.Replicas", Equal(ptr.To(int32(5)))),
9999
))
100100
}
101101

@@ -110,7 +110,7 @@ func TestDefaultObjectList(t *testing.T) {
110110
Not(BeNil()),
111111
HaveField("Items", And(
112112
HaveLen(1),
113-
ContainElement(HaveField("Spec.Replicas", Equal(pointer.Int32(5)))),
113+
ContainElement(HaveField("Spec.Replicas", Equal(ptr.To(int32(5))))),
114114
)),
115115
))
116116
}

0 commit comments

Comments
 (0)