fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

misc: address `k8s.io/utils/pointer` deprecation 

Signed-off-by: Hidde Beydals <hidde@hhh.computer>
This commit is contained in:
Hidde Beydals 2023-10-09 13:38:09 +02:00
parent 3a0c27926e
commit d56d0a7ad7
No known key found for this signature in database
GPG Key ID: 979F380FC2341744
7 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -68,7 +68,7 @@ require (
k8s.io/api v0.27.4 k8s.io/api v0.27.4
k8s.io/apimachinery v0.27.4 k8s.io/apimachinery v0.27.4
k8s.io/client-go v0.27.4 k8s.io/client-go v0.27.4
k8s.io/utils v0.0.0-20230505201702-9f6742963106 k8s.io/utils v0.0.0-20230726121419-3b25d923346b
sigs.k8s.io/cli-utils v0.35.0 sigs.k8s.io/cli-utils v0.35.0
sigs.k8s.io/controller-runtime v0.15.1 sigs.k8s.io/controller-runtime v0.15.1
sigs.k8s.io/yaml v1.3.0 sigs.k8s.io/yaml v1.3.0

4
go.sum
View File

@ -1808,8 +1808,8 @@ k8s.io/kube-openapi v0.0.0-20230515203736-54b630e78af5 h1:azYPdzztXxPSa8wb+hksEK
k8s.io/kube-openapi v0.0.0-20230515203736-54b630e78af5/go.mod h1:kzo02I3kQ4BTtEfVLaPbjvCkX97YqGve33wzlb3fofQ= k8s.io/kube-openapi v0.0.0-20230515203736-54b630e78af5/go.mod h1:kzo02I3kQ4BTtEfVLaPbjvCkX97YqGve33wzlb3fofQ=
k8s.io/kubectl v0.27.3 h1:HyC4o+8rCYheGDWrkcOQHGwDmyLKR5bxXFgpvF82BOw= k8s.io/kubectl v0.27.3 h1:HyC4o+8rCYheGDWrkcOQHGwDmyLKR5bxXFgpvF82BOw=
k8s.io/kubectl v0.27.3/go.mod h1:g9OQNCC2zxT+LT3FS09ZYqnDhlvsKAfFq76oyarBcq4= k8s.io/kubectl v0.27.3/go.mod h1:g9OQNCC2zxT+LT3FS09ZYqnDhlvsKAfFq76oyarBcq4=
k8s.io/utils v0.0.0-20230505201702-9f6742963106 h1:EObNQ3TW2D+WptiYXlApGNLVy0zm/JIBVY9i+M4wpAU= k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
k8s.io/utils v0.0.0-20230505201702-9f6742963106/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
oras.land/oras-go v1.2.3 h1:v8PJl+gEAntI1pJ/LCrDgsuk+1PKVavVEPsYIHFE5uY= oras.land/oras-go v1.2.3 h1:v8PJl+gEAntI1pJ/LCrDgsuk+1PKVavVEPsYIHFE5uY=
oras.land/oras-go v1.2.3/go.mod h1:M/uaPdYklze0Vf3AakfarnpoEckvw0ESbRdN8Z1vdJg= oras.land/oras-go v1.2.3/go.mod h1:M/uaPdYklze0Vf3AakfarnpoEckvw0ESbRdN8Z1vdJg=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

4
internal/controller/gitrepository_controller.go
View File

@ -33,7 +33,7 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
kuberecorder "k8s.io/client-go/tools/record" kuberecorder "k8s.io/client-go/tools/record"
"k8s.io/utils/pointer" "k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime" ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client"
@ -1106,7 +1106,7 @@ func (r *GitRepositoryReconciler) eventLogf(ctx context.Context, obj runtime.Obj
// changed and requires rebuilding the artifact. Rebuilding the artifact is also // changed and requires rebuilding the artifact. Rebuilding the artifact is also
// required if the object needs to be (re)verified. // required if the object needs to be (re)verified.
func gitContentConfigChanged(obj *sourcev1.GitRepository, includes *artifactSet) bool { func gitContentConfigChanged(obj *sourcev1.GitRepository, includes *artifactSet) bool {
if !pointer.StringEqual(obj.Spec.Ignore, obj.Status.ObservedIgnore) { if !ptr.Equal(obj.Spec.Ignore, obj.Status.ObservedIgnore) {
return true return true
} }
if obj.Spec.RecurseSubmodules != obj.Status.ObservedRecurseSubmodules { if obj.Spec.RecurseSubmodules != obj.Status.ObservedRecurseSubmodules {

12
internal/controller/gitrepository_controller_test.go
View File

@ -40,7 +40,7 @@ import (
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
"k8s.io/utils/pointer" "k8s.io/utils/ptr"
kstatus "sigs.k8s.io/cli-utils/pkg/kstatus/status" kstatus "sigs.k8s.io/cli-utils/pkg/kstatus/status"
ctrl "sigs.k8s.io/controller-runtime" ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client"
@ -827,7 +827,7 @@ func TestGitRepositoryReconciler_reconcileSource_checkoutStrategy(t *testing.T)
}, },
beforeFunc: func(obj *sourcev1.GitRepository, latestRev string) { beforeFunc: func(obj *sourcev1.GitRepository, latestRev string) {
// Set new ignore value. // Set new ignore value.
obj.Spec.Ignore = pointer.StringPtr("foo") obj.Spec.Ignore = ptr.To("foo")
// Add existing artifact on the object and storage. // Add existing artifact on the object and storage.
obj.Status = sourcev1.GitRepositoryStatus{ obj.Status = sourcev1.GitRepositoryStatus{
Artifact: &sourcev1.Artifact{ Artifact: &sourcev1.Artifact{
@ -1001,7 +1001,7 @@ func TestGitRepositoryReconciler_reconcileArtifact(t *testing.T) {
dir: "testdata/git/repository", dir: "testdata/git/repository",
beforeFunc: func(obj *sourcev1.GitRepository) { beforeFunc: func(obj *sourcev1.GitRepository) {
obj.Spec.Interval = metav1.Duration{Duration: interval} obj.Spec.Interval = metav1.Duration{Duration: interval}
obj.Spec.Ignore = pointer.StringPtr("!**.txt\n") obj.Spec.Ignore = ptr.To("!**.txt\n")
}, },
afterFunc: func(t *WithT, obj *sourcev1.GitRepository) { afterFunc: func(t *WithT, obj *sourcev1.GitRepository) {
t.Expect(obj.GetArtifact()).ToNot(BeNil()) t.Expect(obj.GetArtifact()).ToNot(BeNil())
@ -2833,15 +2833,15 @@ func TestGitContentConfigChanged(t *testing.T) {
{ {
name: "unobserved ignore", name: "unobserved ignore",
obj: sourcev1.GitRepository{ obj: sourcev1.GitRepository{
Spec: sourcev1.GitRepositorySpec{Ignore: pointer.String("foo")}, Spec: sourcev1.GitRepositorySpec{Ignore: ptr.To("foo")},
}, },
want: true, want: true,
}, },
{ {
name: "observed ignore", name: "observed ignore",
obj: sourcev1.GitRepository{ obj: sourcev1.GitRepository{
Spec: sourcev1.GitRepositorySpec{Ignore: pointer.String("foo")}, Spec: sourcev1.GitRepositorySpec{Ignore: ptr.To("foo")},
Status: sourcev1.GitRepositoryStatus{ObservedIgnore: pointer.String("foo")}, Status: sourcev1.GitRepositoryStatus{ObservedIgnore: ptr.To("foo")},
}, },
want: false, want: false,
}, },

4
internal/controller/ocirepository_controller.go
View File

@ -41,7 +41,7 @@ import (
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
kuberecorder "k8s.io/client-go/tools/record" kuberecorder "k8s.io/client-go/tools/record"
"k8s.io/utils/pointer" "k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime" ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/builder"
@ -1176,7 +1176,7 @@ type remoteOptions []remote.Option
// of the artifact in the status to determine if artifact content configuration // of the artifact in the status to determine if artifact content configuration
// has changed and requires rebuilding the artifact. // has changed and requires rebuilding the artifact.
func ociContentConfigChanged(obj *ociv1.OCIRepository) bool { func ociContentConfigChanged(obj *ociv1.OCIRepository) bool {
if !pointer.StringEqual(obj.Spec.Ignore, obj.Status.ObservedIgnore) { if !ptr.Equal(obj.Spec.Ignore, obj.Status.ObservedIgnore) {
return true return true
} }

36
internal/controller/ocirepository_controller_test.go
View File

@ -48,7 +48,7 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
"k8s.io/utils/pointer" "k8s.io/utils/ptr"
kstatus "sigs.k8s.io/cli-utils/pkg/kstatus/status" kstatus "sigs.k8s.io/cli-utils/pkg/kstatus/status"
ctrl "sigs.k8s.io/controller-runtime" ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client"
@ -1483,7 +1483,7 @@ func TestOCIRepository_reconcileSource_noop(t *testing.T) {
{ {
name: "full reconcile - same rev, unobserved ignore", name: "full reconcile - same rev, unobserved ignore",
beforeFunc: func(obj *ociv1.OCIRepository) { beforeFunc: func(obj *ociv1.OCIRepository) {
obj.Status.ObservedIgnore = pointer.String("aaa") obj.Status.ObservedIgnore = ptr.To("aaa")
obj.Status.Artifact = &sourcev1.Artifact{ obj.Status.Artifact = &sourcev1.Artifact{
Revision: testRevision, Revision: testRevision,
} }
@ -1495,8 +1495,8 @@ func TestOCIRepository_reconcileSource_noop(t *testing.T) {
{ {
name: "noop - same rev, observed ignore", name: "noop - same rev, observed ignore",
beforeFunc: func(obj *ociv1.OCIRepository) { beforeFunc: func(obj *ociv1.OCIRepository) {
obj.Spec.Ignore = pointer.String("aaa") obj.Spec.Ignore = ptr.To("aaa")
obj.Status.ObservedIgnore = pointer.String("aaa") obj.Status.ObservedIgnore = ptr.To("aaa")
obj.Status.Artifact = &sourcev1.Artifact{ obj.Status.Artifact = &sourcev1.Artifact{
Revision: testRevision, Revision: testRevision,
} }
@ -1651,7 +1651,7 @@ func TestOCIRepository_reconcileArtifact(t *testing.T) {
targetPath: "testdata/oci/repository", targetPath: "testdata/oci/repository",
artifact: &sourcev1.Artifact{Revision: "revision"}, artifact: &sourcev1.Artifact{Revision: "revision"},
beforeFunc: func(obj *ociv1.OCIRepository) { beforeFunc: func(obj *ociv1.OCIRepository) {
obj.Spec.Ignore = pointer.String("foo.txt") obj.Spec.Ignore = ptr.To("foo.txt")
}, },
want: sreconcile.ResultSuccess, want: sreconcile.ResultSuccess,
assertPaths: []string{ assertPaths: []string{
@ -1691,7 +1691,7 @@ func TestOCIRepository_reconcileArtifact(t *testing.T) {
}, },
beforeFunc: func(obj *ociv1.OCIRepository) { beforeFunc: func(obj *ociv1.OCIRepository) {
obj.Status.Artifact = &sourcev1.Artifact{Revision: "revision"} obj.Status.Artifact = &sourcev1.Artifact{Revision: "revision"}
obj.Spec.Ignore = pointer.String("aaa") obj.Spec.Ignore = ptr.To("aaa")
}, },
want: sreconcile.ResultSuccess, want: sreconcile.ResultSuccess,
assertPaths: []string{ assertPaths: []string{
@ -1758,10 +1758,10 @@ func TestOCIRepository_reconcileArtifact(t *testing.T) {
Revision: "revision", Revision: "revision",
}, },
beforeFunc: func(obj *ociv1.OCIRepository) { beforeFunc: func(obj *ociv1.OCIRepository) {
obj.Spec.Ignore = pointer.String("aaa") obj.Spec.Ignore = ptr.To("aaa")
obj.Spec.LayerSelector = &ociv1.OCILayerSelector{MediaType: "foo"} obj.Spec.LayerSelector = &ociv1.OCILayerSelector{MediaType: "foo"}
obj.Status.Artifact = &sourcev1.Artifact{Revision: "revision"} obj.Status.Artifact = &sourcev1.Artifact{Revision: "revision"}
obj.Status.ObservedIgnore = pointer.String("aaa") obj.Status.ObservedIgnore = ptr.To("aaa")
obj.Status.ObservedLayerSelector = &ociv1.OCILayerSelector{MediaType: "foo"} obj.Status.ObservedLayerSelector = &ociv1.OCILayerSelector{MediaType: "foo"}
}, },
want: sreconcile.ResultSuccess, want: sreconcile.ResultSuccess,
@ -2544,34 +2544,34 @@ func TestOCIContentConfigChanged(t *testing.T) {
{ {
name: "same ignore, no layer selector", name: "same ignore, no layer selector",
spec: ociv1.OCIRepositorySpec{ spec: ociv1.OCIRepositorySpec{
Ignore: pointer.String("nnn"), Ignore: ptr.To("nnn"),
}, },
status: ociv1.OCIRepositoryStatus{ status: ociv1.OCIRepositoryStatus{
ObservedIgnore: pointer.String("nnn"), ObservedIgnore: ptr.To("nnn"),
}, },
want: false, want: false,
}, },
{ {
name: "different ignore, no layer selector", name: "different ignore, no layer selector",
spec: ociv1.OCIRepositorySpec{ spec: ociv1.OCIRepositorySpec{
Ignore: pointer.String("nnn"), Ignore: ptr.To("nnn"),
}, },
status: ociv1.OCIRepositoryStatus{ status: ociv1.OCIRepositoryStatus{
ObservedIgnore: pointer.String("mmm"), ObservedIgnore: ptr.To("mmm"),
}, },
want: true, want: true,
}, },
{ {
name: "same ignore, same layer selector", name: "same ignore, same layer selector",
spec: ociv1.OCIRepositorySpec{ spec: ociv1.OCIRepositorySpec{
Ignore: pointer.String("nnn"), Ignore: ptr.To("nnn"),
LayerSelector: &ociv1.OCILayerSelector{ LayerSelector: &ociv1.OCILayerSelector{
MediaType: "foo", MediaType: "foo",
Operation: ociv1.OCILayerExtract, Operation: ociv1.OCILayerExtract,
}, },
}, },
status: ociv1.OCIRepositoryStatus{ status: ociv1.OCIRepositoryStatus{
ObservedIgnore: pointer.String("nnn"), ObservedIgnore: ptr.To("nnn"),
ObservedLayerSelector: &ociv1.OCILayerSelector{ ObservedLayerSelector: &ociv1.OCILayerSelector{
MediaType: "foo", MediaType: "foo",
Operation: ociv1.OCILayerExtract, Operation: ociv1.OCILayerExtract,
@ -2582,14 +2582,14 @@ func TestOCIContentConfigChanged(t *testing.T) {
{ {
name: "same ignore, different layer selector operation", name: "same ignore, different layer selector operation",
spec: ociv1.OCIRepositorySpec{ spec: ociv1.OCIRepositorySpec{
Ignore: pointer.String("nnn"), Ignore: ptr.To("nnn"),
LayerSelector: &ociv1.OCILayerSelector{ LayerSelector: &ociv1.OCILayerSelector{
MediaType: "foo", MediaType: "foo",
Operation: ociv1.OCILayerCopy, Operation: ociv1.OCILayerCopy,
}, },
}, },
status: ociv1.OCIRepositoryStatus{ status: ociv1.OCIRepositoryStatus{
ObservedIgnore: pointer.String("nnn"), ObservedIgnore: ptr.To("nnn"),
ObservedLayerSelector: &ociv1.OCILayerSelector{ ObservedLayerSelector: &ociv1.OCILayerSelector{
MediaType: "foo", MediaType: "foo",
Operation: ociv1.OCILayerExtract, Operation: ociv1.OCILayerExtract,
@ -2600,14 +2600,14 @@ func TestOCIContentConfigChanged(t *testing.T) {
{ {
name: "same ignore, different layer selector mediatype", name: "same ignore, different layer selector mediatype",
spec: ociv1.OCIRepositorySpec{ spec: ociv1.OCIRepositorySpec{
Ignore: pointer.String("nnn"), Ignore: ptr.To("nnn"),
LayerSelector: &ociv1.OCILayerSelector{ LayerSelector: &ociv1.OCILayerSelector{
MediaType: "bar", MediaType: "bar",
Operation: ociv1.OCILayerExtract, Operation: ociv1.OCILayerExtract,
}, },
}, },
status: ociv1.OCIRepositoryStatus{ status: ociv1.OCIRepositoryStatus{
ObservedIgnore: pointer.String("nnn"), ObservedIgnore: ptr.To("nnn"),
ObservedLayerSelector: &ociv1.OCILayerSelector{ ObservedLayerSelector: &ociv1.OCILayerSelector{
MediaType: "foo", MediaType: "foo",
Operation: ociv1.OCILayerExtract, Operation: ociv1.OCILayerExtract,

4
main.go
View File

@ -31,7 +31,7 @@ import (
clientgoscheme "k8s.io/client-go/kubernetes/scheme" clientgoscheme "k8s.io/client-go/kubernetes/scheme"
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
"k8s.io/utils/pointer" "k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime" ctrl "sigs.k8s.io/controller-runtime"
ctrlcache "sigs.k8s.io/controller-runtime/pkg/cache" ctrlcache "sigs.k8s.io/controller-runtime/pkg/cache"
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
@ -371,7 +371,7 @@ func mustSetupManager(metricsAddr, healthAddr string, maxConcurrent int,
Namespaces: []string{watchNamespace}, Namespaces: []string{watchNamespace},
}, },
Controller: ctrlcfg.Controller{ Controller: ctrlcfg.Controller{
RecoverPanic: pointer.Bool(true), RecoverPanic: ptr.To(true),
MaxConcurrentReconciles: maxConcurrent, MaxConcurrentReconciles: maxConcurrent,
}, },
}) })