Skip to content

Commit 9a41055

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #337 from kkkkun/bump-controller-runtime
Bump controller runtime to v0.15.0
2 parents ea63b3b + ac2b8d8 commit 9a41055

File tree

24 files changed

+211
-452
lines changed

24 files changed

+211
-452
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ func (r *GuestbookReconciler) SetupWithManager(mgr ctrl.Manager) error {
7878
}
7979

8080
// Watch for changes to Guestbook
81-
err = c.Watch(&source.Kind{Type: &api.Guestbook{}}, &handler.EnqueueRequestForObject{})
81+
err = c.Watch(source.Kind(mgr.GetCache(), &api.Guestbook{}), &handler.EnqueueRequestForObject{})
8282
if err != nil {
8383
return err
8484
}
8585

8686
// Watch for changes to deployed objects
87-
_, err = declarative.WatchChildren(declarative.WatchChildrenOptions{Manager: mgr, Controller: c, Reconciler: r, LabelMaker: r.watchLabels})
87+
err = declarative.WatchChildren(declarative.WatchChildrenOptions{Manager: mgr, Controller: c, Reconciler: r, LabelMaker: r.watchLabels})
8888
if err != nil {
8989
return err
9090
}

‎go.mod

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/kubebuilder-declarative-pattern
22

3-
go 1.19
3+
go 1.20
44

55
// Sometimes handy for development, but breaks usage as a library
66
// Instead, please break apart commits to this module
@@ -11,19 +11,19 @@ require (
1111
github.com/blang/semver/v4 v4.0.0
1212
github.com/evanphx/json-patch/v5 v5.6.0
1313
github.com/go-git/go-git/v5 v5.1.0
14-
github.com/go-logr/logr v1.2.3
14+
github.com/go-logr/logr v1.2.4
1515
github.com/google/go-cmp v0.5.9
16-
github.com/prometheus/client_golang v1.14.0
16+
github.com/prometheus/client_golang v1.15.1
1717
golang.org/x/crypto v0.1.0
18-
golang.org/x/tools v0.3.0
19-
k8s.io/api v0.26.3
20-
k8s.io/apimachinery v0.26.3
18+
golang.org/x/tools v0.9.1
19+
k8s.io/api v0.27.2
20+
k8s.io/apimachinery v0.27.2
2121
k8s.io/cli-runtime v0.26.3
22-
k8s.io/client-go v0.26.3
23-
k8s.io/klog/v2 v2.90.1
22+
k8s.io/client-go v0.27.2
23+
k8s.io/klog/v2 v2.100.1
2424
k8s.io/kubectl v0.26.3
2525
sigs.k8s.io/cli-utils v0.33.0
26-
sigs.k8s.io/controller-runtime v0.14.1
26+
sigs.k8s.io/controller-runtime v0.15.0
2727
sigs.k8s.io/kubebuilder-declarative-pattern/applylib v0.0.0-20230420203711-4abaa68e1923
2828
sigs.k8s.io/kubebuilder-declarative-pattern/mockkubeapiserver v0.0.0-20230303024857-d1f76c15e05b
2929
sigs.k8s.io/kustomize/api v0.12.1
@@ -35,10 +35,10 @@ require (
3535
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
3636
github.com/MakeNowJust/heredoc v1.0.0 // indirect
3737
github.com/beorn7/perks v1.0.1 // indirect
38-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
38+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3939
github.com/chai2010/gettext-go v1.0.2 // indirect
4040
github.com/davecgh/go-spew v1.1.1 // indirect
41-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
41+
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
4242
github.com/emirpasic/gods v1.12.0 // indirect
4343
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
4444
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
@@ -48,67 +48,66 @@ require (
4848
github.com/go-errors/errors v1.0.1 // indirect
4949
github.com/go-git/gcfg v1.5.0 // indirect
5050
github.com/go-git/go-billy/v5 v5.0.0 // indirect
51-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
52-
github.com/go-openapi/jsonreference v0.20.0 // indirect
53-
github.com/go-openapi/swag v0.19.14 // indirect
51+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
52+
github.com/go-openapi/jsonreference v0.20.2 // indirect
53+
github.com/go-openapi/swag v0.22.3 // indirect
5454
github.com/gogo/protobuf v1.3.2 // indirect
5555
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
56-
github.com/golang/protobuf v1.5.2 // indirect
56+
github.com/golang/protobuf v1.5.3 // indirect
5757
github.com/google/btree v1.0.1 // indirect
58-
github.com/google/gnostic v0.5.7-v3refs // indirect
58+
github.com/google/gnostic v0.6.9 // indirect
5959
github.com/google/gofuzz v1.2.0 // indirect
6060
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
6161
github.com/google/uuid v1.3.0 // indirect
6262
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
63-
github.com/imdario/mergo v0.3.12 // indirect
63+
github.com/imdario/mergo v0.3.15 // indirect
6464
github.com/inconshreveable/mousetrap v1.0.1 // indirect
6565
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
6666
github.com/jonboulle/clockwork v0.2.2 // indirect
6767
github.com/josharian/intern v1.0.0 // indirect
6868
github.com/json-iterator/go v1.1.12 // indirect
6969
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
7070
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
71-
github.com/mailru/easyjson v0.7.6 // indirect
72-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
71+
github.com/mailru/easyjson v0.7.7 // indirect
72+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
7373
github.com/mitchellh/go-homedir v1.1.0 // indirect
7474
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
7575
github.com/moby/spdystream v0.2.0 // indirect
76-
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
76+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
7777
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7878
github.com/modern-go/reflect2 v1.0.2 // indirect
7979
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
8080
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8181
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
8282
github.com/pkg/errors v0.9.1 // indirect
83-
github.com/prometheus/client_model v0.3.0 // indirect
84-
github.com/prometheus/common v0.37.0 // indirect
85-
github.com/prometheus/procfs v0.8.0 // indirect
83+
github.com/prometheus/client_model v0.4.0 // indirect
84+
github.com/prometheus/common v0.43.0 // indirect
85+
github.com/prometheus/procfs v0.9.0 // indirect
8686
github.com/russross/blackfriday/v2 v2.1.0 // indirect
8787
github.com/sergi/go-diff v1.1.0 // indirect
8888
github.com/spf13/cobra v1.6.0 // indirect
8989
github.com/spf13/pflag v1.0.5 // indirect
90-
github.com/stretchr/objx v0.4.0 // indirect
9190
github.com/xanzy/ssh-agent v0.2.1 // indirect
9291
github.com/xlab/treeprint v1.1.0 // indirect
9392
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
94-
golang.org/x/mod v0.7.0 // indirect
95-
golang.org/x/net v0.7.0 // indirect
96-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
97-
golang.org/x/sys v0.5.0 // indirect
98-
golang.org/x/term v0.5.0 // indirect
99-
golang.org/x/text v0.7.0 // indirect
93+
golang.org/x/mod v0.10.0 // indirect
94+
golang.org/x/net v0.10.0 // indirect
95+
golang.org/x/oauth2 v0.8.0 // indirect
96+
golang.org/x/sys v0.8.0 // indirect
97+
golang.org/x/term v0.8.0 // indirect
98+
golang.org/x/text v0.9.0 // indirect
10099
golang.org/x/time v0.3.0 // indirect
101-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
100+
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
102101
google.golang.org/appengine v1.6.7 // indirect
103-
google.golang.org/protobuf v1.28.1 // indirect
102+
google.golang.org/protobuf v1.30.0 // indirect
104103
gopkg.in/inf.v0 v0.9.1 // indirect
105104
gopkg.in/warnings.v0 v0.1.2 // indirect
106105
gopkg.in/yaml.v2 v2.4.0 // indirect
107106
gopkg.in/yaml.v3 v3.0.1 // indirect
108-
k8s.io/apiextensions-apiserver v0.26.0 // indirect
109-
k8s.io/component-base v0.26.3 // indirect
110-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
111-
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect
107+
k8s.io/apiextensions-apiserver v0.27.2 // indirect
108+
k8s.io/component-base v0.27.2 // indirect
109+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
110+
k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
112111
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
113112
sigs.k8s.io/kustomize/kstatus v0.0.2-0.20200509233124-065f70705d4d // indirect
114113
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect

0 commit comments

Comments
 (0)