Skip to content

Commit d56d0a7

Browse files
hiddecohiddeco
committed
misc: address k8s.io/utils/pointer deprecation
Signed-off-by: Hidde Beydals <[email protected]>
1 parent 3a0c279 commit d56d0a7

File tree

7 files changed

+33
-33
lines changed

7 files changed

+33
-33
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ require (
6868
k8s.io/api v0.27.4
6969
k8s.io/apimachinery v0.27.4
7070
k8s.io/client-go v0.27.4
71-
k8s.io/utils v0.0.0-20230505201702-9f6742963106
71+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
7272
sigs.k8s.io/cli-utils v0.35.0
7373
sigs.k8s.io/controller-runtime v0.15.1
7474
sigs.k8s.io/yaml v1.3.0

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,8 +1808,8 @@ k8s.io/kube-openapi v0.0.0-20230515203736-54b630e78af5 h1:azYPdzztXxPSa8wb+hksEK
18081808
k8s.io/kube-openapi v0.0.0-20230515203736-54b630e78af5/go.mod h1:kzo02I3kQ4BTtEfVLaPbjvCkX97YqGve33wzlb3fofQ=
18091809
k8s.io/kubectl v0.27.3 h1:HyC4o+8rCYheGDWrkcOQHGwDmyLKR5bxXFgpvF82BOw=
18101810
k8s.io/kubectl v0.27.3/go.mod h1:g9OQNCC2zxT+LT3FS09ZYqnDhlvsKAfFq76oyarBcq4=
1811-
k8s.io/utils v0.0.0-20230505201702-9f6742963106 h1:EObNQ3TW2D+WptiYXlApGNLVy0zm/JIBVY9i+M4wpAU=
1812-
k8s.io/utils v0.0.0-20230505201702-9f6742963106/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
1811+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
1812+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
18131813
oras.land/oras-go v1.2.3 h1:v8PJl+gEAntI1pJ/LCrDgsuk+1PKVavVEPsYIHFE5uY=
18141814
oras.land/oras-go v1.2.3/go.mod h1:M/uaPdYklze0Vf3AakfarnpoEckvw0ESbRdN8Z1vdJg=
18151815
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

‎internal/controller/gitrepository_controller.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/runtime"
3434
"k8s.io/apimachinery/pkg/types"
3535
kuberecorder "k8s.io/client-go/tools/record"
36-
"k8s.io/utils/pointer"
36+
"k8s.io/utils/ptr"
3737
ctrl "sigs.k8s.io/controller-runtime"
3838
"sigs.k8s.io/controller-runtime/pkg/builder"
3939
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -1106,7 +1106,7 @@ func (r *GitRepositoryReconciler) eventLogf(ctx context.Context, obj runtime.Obj
11061106
// changed and requires rebuilding the artifact. Rebuilding the artifact is also
11071107
// required if the object needs to be (re)verified.
11081108
func gitContentConfigChanged(obj *sourcev1.GitRepository, includes *artifactSet) bool {
1109-
if !pointer.StringEqual(obj.Spec.Ignore, obj.Status.ObservedIgnore) {
1109+
if !ptr.Equal(obj.Spec.Ignore, obj.Status.ObservedIgnore) {
11101110
return true
11111111
}
11121112
if obj.Spec.RecurseSubmodules != obj.Status.ObservedRecurseSubmodules {

‎internal/controller/gitrepository_controller_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import (
4040
corev1 "k8s.io/api/core/v1"
4141
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
4242
"k8s.io/client-go/tools/record"
43-
"k8s.io/utils/pointer"
43+
"k8s.io/utils/ptr"
4444
kstatus "sigs.k8s.io/cli-utils/pkg/kstatus/status"
4545
ctrl "sigs.k8s.io/controller-runtime"
4646
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -827,7 +827,7 @@ func TestGitRepositoryReconciler_reconcileSource_checkoutStrategy(t *testing.T)
827827
},
828828
beforeFunc: func(obj *sourcev1.GitRepository, latestRev string) {
829829
// Set new ignore value.
830-
obj.Spec.Ignore = pointer.StringPtr("foo")
830+
obj.Spec.Ignore = ptr.To("foo")
831831
// Add existing artifact on the object and storage.
832832
obj.Status = sourcev1.GitRepositoryStatus{
833833
Artifact: &sourcev1.Artifact{
@@ -1001,7 +1001,7 @@ func TestGitRepositoryReconciler_reconcileArtifact(t *testing.T) {
10011001
dir: "testdata/git/repository",
10021002
beforeFunc: func(obj *sourcev1.GitRepository) {
10031003
obj.Spec.Interval = metav1.Duration{Duration: interval}
1004-
obj.Spec.Ignore = pointer.StringPtr("!**.txt\n")
1004+
obj.Spec.Ignore = ptr.To("!**.txt\n")
10051005
},
10061006
afterFunc: func(t *WithT, obj *sourcev1.GitRepository) {
10071007
t.Expect(obj.GetArtifact()).ToNot(BeNil())
@@ -2833,15 +2833,15 @@ func TestGitContentConfigChanged(t *testing.T) {
28332833
{
28342834
name: "unobserved ignore",
28352835
obj: sourcev1.GitRepository{
2836-
Spec: sourcev1.GitRepositorySpec{Ignore: pointer.String("foo")},
2836+
Spec: sourcev1.GitRepositorySpec{Ignore: ptr.To("foo")},
28372837
},
28382838
want: true,
28392839
},
28402840
{
28412841
name: "observed ignore",
28422842
obj: sourcev1.GitRepository{
2843-
Spec: sourcev1.GitRepositorySpec{Ignore: pointer.String("foo")},
2844-
Status: sourcev1.GitRepositoryStatus{ObservedIgnore: pointer.String("foo")},
2843+
Spec: sourcev1.GitRepositorySpec{Ignore: ptr.To("foo")},
2844+
Status: sourcev1.GitRepositoryStatus{ObservedIgnore: ptr.To("foo")},
28452845
},
28462846
want: false,
28472847
},

‎internal/controller/ocirepository_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import (
4141
"k8s.io/apimachinery/pkg/types"
4242
"k8s.io/apimachinery/pkg/util/sets"
4343
kuberecorder "k8s.io/client-go/tools/record"
44-
"k8s.io/utils/pointer"
44+
"k8s.io/utils/ptr"
4545

4646
ctrl "sigs.k8s.io/controller-runtime"
4747
"sigs.k8s.io/controller-runtime/pkg/builder"
@@ -1176,7 +1176,7 @@ type remoteOptions []remote.Option
11761176
// of the artifact in the status to determine if artifact content configuration
11771177
// has changed and requires rebuilding the artifact.
11781178
func ociContentConfigChanged(obj *ociv1.OCIRepository) bool {
1179-
if !pointer.StringEqual(obj.Spec.Ignore, obj.Status.ObservedIgnore) {
1179+
if !ptr.Equal(obj.Spec.Ignore, obj.Status.ObservedIgnore) {
11801180
return true
11811181
}
11821182

‎internal/controller/ocirepository_controller_test.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import (
4848
apierrors "k8s.io/apimachinery/pkg/api/errors"
4949
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
5050
"k8s.io/client-go/tools/record"
51-
"k8s.io/utils/pointer"
51+
"k8s.io/utils/ptr"
5252
kstatus "sigs.k8s.io/cli-utils/pkg/kstatus/status"
5353
ctrl "sigs.k8s.io/controller-runtime"
5454
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -1483,7 +1483,7 @@ func TestOCIRepository_reconcileSource_noop(t *testing.T) {
14831483
{
14841484
name: "full reconcile - same rev, unobserved ignore",
14851485
beforeFunc: func(obj *ociv1.OCIRepository) {
1486-
obj.Status.ObservedIgnore = pointer.String("aaa")
1486+
obj.Status.ObservedIgnore = ptr.To("aaa")
14871487
obj.Status.Artifact = &sourcev1.Artifact{
14881488
Revision: testRevision,
14891489
}
@@ -1495,8 +1495,8 @@ func TestOCIRepository_reconcileSource_noop(t *testing.T) {
14951495
{
14961496
name: "noop - same rev, observed ignore",
14971497
beforeFunc: func(obj *ociv1.OCIRepository) {
1498-
obj.Spec.Ignore = pointer.String("aaa")
1499-
obj.Status.ObservedIgnore = pointer.String("aaa")
1498+
obj.Spec.Ignore = ptr.To("aaa")
1499+
obj.Status.ObservedIgnore = ptr.To("aaa")
15001500
obj.Status.Artifact = &sourcev1.Artifact{
15011501
Revision: testRevision,
15021502
}
@@ -1651,7 +1651,7 @@ func TestOCIRepository_reconcileArtifact(t *testing.T) {
16511651
targetPath: "testdata/oci/repository",
16521652
artifact: &sourcev1.Artifact{Revision: "revision"},
16531653
beforeFunc: func(obj *ociv1.OCIRepository) {
1654-
obj.Spec.Ignore = pointer.String("foo.txt")
1654+
obj.Spec.Ignore = ptr.To("foo.txt")
16551655
},
16561656
want: sreconcile.ResultSuccess,
16571657
assertPaths: []string{
@@ -1691,7 +1691,7 @@ func TestOCIRepository_reconcileArtifact(t *testing.T) {
16911691
},
16921692
beforeFunc: func(obj *ociv1.OCIRepository) {
16931693
obj.Status.Artifact = &sourcev1.Artifact{Revision: "revision"}
1694-
obj.Spec.Ignore = pointer.String("aaa")
1694+
obj.Spec.Ignore = ptr.To("aaa")
16951695
},
16961696
want: sreconcile.ResultSuccess,
16971697
assertPaths: []string{
@@ -1758,10 +1758,10 @@ func TestOCIRepository_reconcileArtifact(t *testing.T) {
17581758
Revision: "revision",
17591759
},
17601760
beforeFunc: func(obj *ociv1.OCIRepository) {
1761-
obj.Spec.Ignore = pointer.String("aaa")
1761+
obj.Spec.Ignore = ptr.To("aaa")
17621762
obj.Spec.LayerSelector = &ociv1.OCILayerSelector{MediaType: "foo"}
17631763
obj.Status.Artifact = &sourcev1.Artifact{Revision: "revision"}
1764-
obj.Status.ObservedIgnore = pointer.String("aaa")
1764+
obj.Status.ObservedIgnore = ptr.To("aaa")
17651765
obj.Status.ObservedLayerSelector = &ociv1.OCILayerSelector{MediaType: "foo"}
17661766
},
17671767
want: sreconcile.ResultSuccess,
@@ -2544,34 +2544,34 @@ func TestOCIContentConfigChanged(t *testing.T) {
25442544
{
25452545
name: "same ignore, no layer selector",
25462546
spec: ociv1.OCIRepositorySpec{
2547-
Ignore: pointer.String("nnn"),
2547+
Ignore: ptr.To("nnn"),
25482548
},
25492549
status: ociv1.OCIRepositoryStatus{
2550-
ObservedIgnore: pointer.String("nnn"),
2550+
ObservedIgnore: ptr.To("nnn"),
25512551
},
25522552
want: false,
25532553
},
25542554
{
25552555
name: "different ignore, no layer selector",
25562556
spec: ociv1.OCIRepositorySpec{
2557-
Ignore: pointer.String("nnn"),
2557+
Ignore: ptr.To("nnn"),
25582558
},
25592559
status: ociv1.OCIRepositoryStatus{
2560-
ObservedIgnore: pointer.String("mmm"),
2560+
ObservedIgnore: ptr.To("mmm"),
25612561
},
25622562
want: true,
25632563
},
25642564
{
25652565
name: "same ignore, same layer selector",
25662566
spec: ociv1.OCIRepositorySpec{
2567-
Ignore: pointer.String("nnn"),
2567+
Ignore: ptr.To("nnn"),
25682568
LayerSelector: &ociv1.OCILayerSelector{
25692569
MediaType: "foo",
25702570
Operation: ociv1.OCILayerExtract,
25712571
},
25722572
},
25732573
status: ociv1.OCIRepositoryStatus{
2574-
ObservedIgnore: pointer.String("nnn"),
2574+
ObservedIgnore: ptr.To("nnn"),
25752575
ObservedLayerSelector: &ociv1.OCILayerSelector{
25762576
MediaType: "foo",
25772577
Operation: ociv1.OCILayerExtract,
@@ -2582,14 +2582,14 @@ func TestOCIContentConfigChanged(t *testing.T) {
25822582
{
25832583
name: "same ignore, different layer selector operation",
25842584
spec: ociv1.OCIRepositorySpec{
2585-
Ignore: pointer.String("nnn"),
2585+
Ignore: ptr.To("nnn"),
25862586
LayerSelector: &ociv1.OCILayerSelector{
25872587
MediaType: "foo",
25882588
Operation: ociv1.OCILayerCopy,
25892589
},
25902590
},
25912591
status: ociv1.OCIRepositoryStatus{
2592-
ObservedIgnore: pointer.String("nnn"),
2592+
ObservedIgnore: ptr.To("nnn"),
25932593
ObservedLayerSelector: &ociv1.OCILayerSelector{
25942594
MediaType: "foo",
25952595
Operation: ociv1.OCILayerExtract,
@@ -2600,14 +2600,14 @@ func TestOCIContentConfigChanged(t *testing.T) {
26002600
{
26012601
name: "same ignore, different layer selector mediatype",
26022602
spec: ociv1.OCIRepositorySpec{
2603-
Ignore: pointer.String("nnn"),
2603+
Ignore: ptr.To("nnn"),
26042604
LayerSelector: &ociv1.OCILayerSelector{
26052605
MediaType: "bar",
26062606
Operation: ociv1.OCILayerExtract,
26072607
},
26082608
},
26092609
status: ociv1.OCIRepositoryStatus{
2610-
ObservedIgnore: pointer.String("nnn"),
2610+
ObservedIgnore: ptr.To("nnn"),
26112611
ObservedLayerSelector: &ociv1.OCILayerSelector{
26122612
MediaType: "foo",
26132613
Operation: ociv1.OCILayerExtract,

‎main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
3232
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
3333
"k8s.io/client-go/tools/record"
34-
"k8s.io/utils/pointer"
34+
"k8s.io/utils/ptr"
3535
ctrl "sigs.k8s.io/controller-runtime"
3636
ctrlcache "sigs.k8s.io/controller-runtime/pkg/cache"
3737
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
@@ -371,7 +371,7 @@ func mustSetupManager(metricsAddr, healthAddr string, maxConcurrent int,
371371
Namespaces: []string{watchNamespace},
372372
},
373373
Controller: ctrlcfg.Controller{
374-
RecoverPanic: pointer.Bool(true),
374+
RecoverPanic: ptr.To(true),
375375
MaxConcurrentReconciles: maxConcurrent,
376376
},
377377
})

0 commit comments

Comments
 (0)