Skip to content

Commit f71e4d3

Browse files
mclarke47mclarke47
committed
chore: update k8s libraries
Signed-off-by: Matthew Clarke <[email protected]>
1 parent 57a043f commit f71e4d3

File tree

10 files changed

+445
-309
lines changed

10 files changed

+445
-309
lines changed

‎commonclient/factory_cr15.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414

1515
// SourceKind is a version-indendenent abstraction over calling source.Kind
1616
func SourceKind(cache cache.Cache, obj client.Object) source.Source {
17-
return source.Kind(cache, obj)
17+
return source.Kind(cache, obj, &handler.TypedEnqueueRequestForObject[client.Object]{})
1818
}
1919

2020
// WrapEventHandler is a version-indendenent abstraction over handler.EventHandler

‎examples/guestbook-operator/controllers/guestbook_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func (r *GuestbookReconciler) SetupWithManager(mgr ctrl.Manager) error {
7777
}
7878

7979
// Watch for changes to Guestbook
80-
err = c.Watch(source.Kind(mgr.GetCache(), &api.Guestbook{}), &handler.EnqueueRequestForObject{})
80+
err = c.Watch(source.TypedKind[*api.Guestbook](mgr.GetCache(), &api.Guestbook{}, &handler.TypedEnqueueRequestForObject[*api.Guestbook]{}))
8181
if err != nil {
8282
return err
8383
}

‎examples/guestbook-operator/go.mod

+43-41
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module sigs.k8s.io/kubebuilder-declarative-pattern/examples/guestbook-operator
22

3-
go 1.21
3+
go 1.22.0
44

5-
toolchain go1.22.0
5+
toolchain go1.22.4
66

77
require (
8-
github.com/go-logr/logr v1.4.1
9-
k8s.io/apimachinery v0.29.1
10-
k8s.io/client-go v0.29.1
11-
sigs.k8s.io/controller-runtime v0.17.2
8+
github.com/go-logr/logr v1.4.2
9+
k8s.io/apimachinery v0.31.1
10+
k8s.io/client-go v0.31.1
11+
sigs.k8s.io/controller-runtime v0.19.0
1212
sigs.k8s.io/kubebuilder-declarative-pattern v0.0.0-20210922163802-cac4a6cf1977
1313
)
1414

@@ -17,94 +17,96 @@ require (
1717
github.com/MakeNowJust/heredoc v1.0.0 // indirect
1818
github.com/beorn7/perks v1.0.1 // indirect
1919
github.com/blang/semver/v4 v4.0.0 // indirect
20-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
20+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2121
github.com/chai2010/gettext-go v1.0.2 // indirect
22-
github.com/davecgh/go-spew v1.1.1 // indirect
23-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
22+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
23+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
2424
github.com/emirpasic/gods v1.12.0 // indirect
2525
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
26-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
26+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
2727
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
2828
github.com/fatih/camelcase v1.0.0 // indirect
2929
github.com/fsnotify/fsnotify v1.7.0 // indirect
3030
github.com/fvbommel/sortorder v1.1.0 // indirect
31+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3132
github.com/go-errors/errors v1.4.2 // indirect
3233
github.com/go-git/gcfg v1.5.0 // indirect
3334
github.com/go-git/go-billy/v5 v5.0.0 // indirect
3435
github.com/go-git/go-git/v5 v5.1.0 // indirect
3536
github.com/go-logr/zapr v1.3.0 // indirect
36-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
37-
github.com/go-openapi/jsonreference v0.20.2 // indirect
38-
github.com/go-openapi/swag v0.22.3 // indirect
37+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
38+
github.com/go-openapi/jsonreference v0.21.0 // indirect
39+
github.com/go-openapi/swag v0.23.0 // indirect
3940
github.com/gogo/protobuf v1.3.2 // indirect
4041
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
41-
github.com/golang/protobuf v1.5.3 // indirect
42+
github.com/golang/protobuf v1.5.4 // indirect
4243
github.com/google/btree v1.0.1 // indirect
4344
github.com/google/gnostic-models v0.6.8 // indirect
4445
github.com/google/go-cmp v0.6.0 // indirect
4546
github.com/google/gofuzz v1.2.0 // indirect
4647
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
47-
github.com/google/uuid v1.3.0 // indirect
48+
github.com/google/uuid v1.6.0 // indirect
4849
github.com/gorilla/websocket v1.5.0 // indirect
4950
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
50-
github.com/imdario/mergo v0.3.15 // indirect
51+
github.com/imdario/mergo v0.3.16 // indirect
5152
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5253
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
5354
github.com/jonboulle/clockwork v0.2.2 // indirect
5455
github.com/josharian/intern v1.0.0 // indirect
5556
github.com/json-iterator/go v1.1.12 // indirect
5657
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
58+
github.com/klauspost/compress v1.17.9 // indirect
5759
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
5860
github.com/mailru/easyjson v0.7.7 // indirect
59-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
6061
github.com/mitchellh/go-homedir v1.1.0 // indirect
6162
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
62-
github.com/moby/spdystream v0.2.0 // indirect
63-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
63+
github.com/moby/spdystream v0.4.0 // indirect
64+
github.com/moby/term v0.5.0 // indirect
6465
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6566
github.com/modern-go/reflect2 v1.0.2 // indirect
6667
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
6768
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6869
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
6970
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7071
github.com/pkg/errors v0.9.1 // indirect
71-
github.com/prometheus/client_golang v1.18.0 // indirect
72-
github.com/prometheus/client_model v0.5.0 // indirect
73-
github.com/prometheus/common v0.45.0 // indirect
74-
github.com/prometheus/procfs v0.12.0 // indirect
72+
github.com/prometheus/client_golang v1.20.4 // indirect
73+
github.com/prometheus/client_model v0.6.1 // indirect
74+
github.com/prometheus/common v0.59.1 // indirect
75+
github.com/prometheus/procfs v0.15.1 // indirect
7576
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7677
github.com/sergi/go-diff v1.1.0 // indirect
77-
github.com/spf13/cobra v1.7.0 // indirect
78+
github.com/spf13/cobra v1.8.1 // indirect
7879
github.com/spf13/pflag v1.0.5 // indirect
80+
github.com/x448/float16 v0.8.4 // indirect
7981
github.com/xanzy/ssh-agent v0.2.1 // indirect
8082
github.com/xlab/treeprint v1.2.0 // indirect
8183
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
8284
go.uber.org/multierr v1.11.0 // indirect
8385
go.uber.org/zap v1.26.0 // indirect
84-
golang.org/x/crypto v0.16.0 // indirect
85-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
86-
golang.org/x/net v0.19.0 // indirect
87-
golang.org/x/oauth2 v0.12.0 // indirect
88-
golang.org/x/sync v0.5.0 // indirect
89-
golang.org/x/sys v0.16.0 // indirect
90-
golang.org/x/term v0.15.0 // indirect
91-
golang.org/x/text v0.14.0 // indirect
92-
golang.org/x/time v0.3.0 // indirect
86+
golang.org/x/crypto v0.27.0 // indirect
87+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
88+
golang.org/x/net v0.29.0 // indirect
89+
golang.org/x/oauth2 v0.23.0 // indirect
90+
golang.org/x/sync v0.8.0 // indirect
91+
golang.org/x/sys v0.25.0 // indirect
92+
golang.org/x/term v0.24.0 // indirect
93+
golang.org/x/text v0.18.0 // indirect
94+
golang.org/x/time v0.6.0 // indirect
9395
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
94-
google.golang.org/appengine v1.6.7 // indirect
95-
google.golang.org/protobuf v1.31.0 // indirect
96+
google.golang.org/protobuf v1.34.2 // indirect
97+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9698
gopkg.in/inf.v0 v0.9.1 // indirect
9799
gopkg.in/warnings.v0 v0.1.2 // indirect
98100
gopkg.in/yaml.v2 v2.4.0 // indirect
99101
gopkg.in/yaml.v3 v3.0.1 // indirect
100-
k8s.io/api v0.29.1 // indirect
101-
k8s.io/apiextensions-apiserver v0.29.0 // indirect
102+
k8s.io/api v0.31.1 // indirect
103+
k8s.io/apiextensions-apiserver v0.31.1 // indirect
102104
k8s.io/cli-runtime v0.29.1 // indirect
103-
k8s.io/component-base v0.29.1 // indirect
104-
k8s.io/klog/v2 v2.110.1 // indirect
105-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
105+
k8s.io/component-base v0.31.1 // indirect
106+
k8s.io/klog/v2 v2.130.1 // indirect
107+
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
106108
k8s.io/kubectl v0.29.1 // indirect
107-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
109+
k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 // indirect
108110
sigs.k8s.io/cli-utils v0.33.0 // indirect
109111
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
110112
sigs.k8s.io/kubebuilder-declarative-pattern/applylib v0.0.0-20230420203711-4abaa68e1923 // indirect

0 commit comments

Comments
 (0)