Skip to content

Commit c65a2df

Browse files
hiddecohiddeco
committed
Update ctrl-runtime (v0.15), Kubernetes (v1.27), kyaml (v5)
This deals with various breaking changes in controller-runtime, as documented in the release notes: https://github.com/kubernetes-sigs/controller-runtime/releases/tag/v0.15.0 In short: - `Watches` now use a `client.Object` instead of a `source.Kind`. - `handler.MapFunc` signature accepts a Go context, which is used to log any errors, instead of silently ignoring them and/or panicking. - Fake clients used in tests are now configured using `WithStatusSubresource` to enable the correct behavior for status updates and patches. - Max concurrent reconciles and panic recovery is configured on the manager, instead of configuring them per reconciler instance. - Various manager configuration options have been moved to new structures and/or fields. In addition to this, all other dependencies which had updates are updated to their latest (compatible) versions as well. Including an update of kyaml to match Kustomize v5. Signed-off-by: Hidde Beydals <[email protected]>
1 parent 7e85148 commit c65a2df

File tree

9 files changed

+195
-522
lines changed

9 files changed

+195
-522
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ifeq ($(shell uname -s),Linux)
4646
endif
4747

4848
# API (doc) generation utilities
49-
CONTROLLER_GEN_VERSION ?= v0.11.1
49+
CONTROLLER_GEN_VERSION ?= v0.12.0
5050
GEN_API_REF_DOCS_VERSION ?= e327d0730470cbd61b06300f81c5fcf91c23c113
5151

5252
# If gobin not set, create one on ./build and add to path.

‎config/crd/bases/image.toolkit.fluxcd.io_imageupdateautomations.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.1
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.12.0
87
name: imageupdateautomations.image.toolkit.fluxcd.io
98
spec:
109
group: image.toolkit.fluxcd.io

‎go.mod‎

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -7,44 +7,45 @@ replace github.com/fluxcd/image-automation-controller/api => ./api
77
require (
88
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1
99
github.com/Masterminds/sprig/v3 v3.2.3
10-
github.com/ProtonMail/go-crypto v0.0.0-20230426101702-58e86b294756
10+
github.com/ProtonMail/go-crypto v0.0.0-20230518184743-7afd39499903
1111
github.com/cyphar/filepath-securejoin v0.2.3
1212
github.com/fluxcd/go-git/v5 v5.0.0-20221219190809-2e5c9d01cfc4
1313
github.com/fluxcd/image-automation-controller/api v0.33.1
1414
github.com/fluxcd/image-reflector-controller/api v0.27.2
1515
github.com/fluxcd/pkg/apis/acl v0.1.0
16-
github.com/fluxcd/pkg/apis/event v0.4.1
17-
github.com/fluxcd/pkg/apis/meta v1.0.0
18-
github.com/fluxcd/pkg/git v0.11.0
19-
github.com/fluxcd/pkg/git/gogit v0.8.1
20-
github.com/fluxcd/pkg/gittestserver v0.8.2
21-
github.com/fluxcd/pkg/runtime v0.35.0
22-
github.com/fluxcd/pkg/ssh v0.7.3
16+
github.com/fluxcd/pkg/apis/event v0.5.0
17+
github.com/fluxcd/pkg/apis/meta v1.1.0
18+
github.com/fluxcd/pkg/git v0.12.2
19+
github.com/fluxcd/pkg/git/gogit v0.10.0
20+
github.com/fluxcd/pkg/gittestserver v0.8.3
21+
github.com/fluxcd/pkg/runtime v0.38.1
22+
github.com/fluxcd/pkg/ssh v0.7.4
2323
github.com/fluxcd/source-controller/api v1.0.0-rc.3
2424
github.com/go-git/go-billy/v5 v5.4.1
2525
github.com/go-logr/logr v1.2.4
26-
github.com/google/go-containerregistry v0.15.1
27-
github.com/onsi/gomega v1.27.6
26+
github.com/google/go-containerregistry v0.15.2
27+
github.com/onsi/gomega v1.27.7
2828
github.com/otiai10/copy v1.11.0
2929
github.com/spf13/pflag v1.0.5
30-
k8s.io/api v0.26.3
31-
k8s.io/apimachinery v0.26.3
32-
k8s.io/client-go v0.26.3
33-
k8s.io/kube-openapi v0.0.0-20230327201221-f5883ff37f0c
34-
sigs.k8s.io/controller-runtime v0.14.6
35-
sigs.k8s.io/kustomize/kyaml v0.13.9
30+
k8s.io/api v0.27.2
31+
k8s.io/apimachinery v0.27.2
32+
k8s.io/client-go v0.27.2
33+
k8s.io/kube-openapi v0.0.0-20230524182850-78281498afbb
34+
k8s.io/utils v0.0.0-20230505201702-9f6742963106
35+
sigs.k8s.io/controller-runtime v0.15.0
36+
sigs.k8s.io/kustomize/kyaml v0.14.2
3637
)
3738

3839
require (
3940
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
4041
github.com/MakeNowJust/heredoc v1.0.0 // indirect
4142
github.com/Masterminds/goutils v1.1.1 // indirect
42-
github.com/Masterminds/semver/v3 v3.2.0 // indirect
43+
github.com/Masterminds/semver/v3 v3.2.1 // indirect
4344
github.com/Microsoft/go-winio v0.6.1 // indirect
4445
github.com/acomagu/bufpipe v1.0.4 // indirect
4546
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
4647
github.com/beorn7/perks v1.0.1 // indirect
47-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
48+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4849
github.com/chai2010/gettext-go v1.0.2 // indirect
4950
github.com/cloudflare/circl v1.3.3 // indirect
5051
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -54,11 +55,11 @@ require (
5455
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
5556
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
5657
github.com/fluxcd/gitkit v0.6.0 // indirect
57-
github.com/fluxcd/pkg/version v0.2.1 // indirect
58+
github.com/fluxcd/pkg/version v0.2.2 // indirect
5859
github.com/fsnotify/fsnotify v1.6.0 // indirect
5960
github.com/go-errors/errors v1.4.2 // indirect
60-
github.com/go-git/gcfg v1.5.0 // indirect
61-
github.com/go-logr/zapr v1.2.3 // indirect
61+
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
62+
github.com/go-logr/zapr v1.2.4 // indirect
6263
github.com/go-openapi/jsonpointer v0.19.6 // indirect
6364
github.com/go-openapi/jsonreference v0.20.1 // indirect
6465
github.com/go-openapi/swag v0.22.3 // indirect
@@ -90,7 +91,6 @@ require (
9091
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
9192
github.com/mitchellh/copystructure v1.2.0 // indirect
9293
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
93-
github.com/mitchellh/mapstructure v1.5.0 // indirect
9494
github.com/mitchellh/reflectwalk v1.0.2 // indirect
9595
github.com/moby/spdystream v0.2.0 // indirect
9696
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
@@ -102,15 +102,14 @@ require (
102102
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
103103
github.com/pjbgf/sha1cd v0.3.0 // indirect
104104
github.com/pkg/errors v0.9.1 // indirect
105-
github.com/prometheus/client_golang v1.14.0 // indirect
106-
github.com/prometheus/client_model v0.3.0 // indirect
107-
github.com/prometheus/common v0.37.0 // indirect
108-
github.com/prometheus/procfs v0.8.0 // indirect
109-
github.com/rogpeppe/go-internal v1.8.0 // indirect
105+
github.com/prometheus/client_golang v1.15.1 // indirect
106+
github.com/prometheus/client_model v0.4.0 // indirect
107+
github.com/prometheus/common v0.42.0 // indirect
108+
github.com/prometheus/procfs v0.9.0 // indirect
110109
github.com/russross/blackfriday v1.6.0 // indirect
111110
github.com/sergi/go-diff v1.3.1 // indirect
112111
github.com/shopspring/decimal v1.2.0 // indirect
113-
github.com/skeema/knownhosts v1.1.0 // indirect
112+
github.com/skeema/knownhosts v1.1.1 // indirect
114113
github.com/spf13/cast v1.5.0 // indirect
115114
github.com/spf13/cobra v1.7.0 // indirect
116115
github.com/xanzy/ssh-agent v0.3.3 // indirect
@@ -119,31 +118,30 @@ require (
119118
go.uber.org/atomic v1.10.0 // indirect
120119
go.uber.org/multierr v1.8.0 // indirect
121120
go.uber.org/zap v1.24.0 // indirect
122-
golang.org/x/crypto v0.7.0 // indirect
121+
golang.org/x/crypto v0.9.0 // indirect
123122
golang.org/x/mod v0.10.0 // indirect
124-
golang.org/x/net v0.9.0 // indirect
123+
golang.org/x/net v0.10.0 // indirect
125124
golang.org/x/oauth2 v0.7.0 // indirect
126-
golang.org/x/sys v0.7.0 // indirect
127-
golang.org/x/term v0.7.0 // indirect
125+
golang.org/x/sys v0.8.0 // indirect
126+
golang.org/x/term v0.8.0 // indirect
128127
golang.org/x/text v0.9.0 // indirect
129128
golang.org/x/time v0.3.0 // indirect
130-
golang.org/x/tools v0.8.0 // indirect
131-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
129+
golang.org/x/tools v0.9.1 // indirect
130+
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
132131
google.golang.org/appengine v1.6.7 // indirect
133132
google.golang.org/protobuf v1.30.0 // indirect
134133
gopkg.in/inf.v0 v0.9.1 // indirect
135134
gopkg.in/warnings.v0 v0.1.2 // indirect
136135
gopkg.in/yaml.v2 v2.4.0 // indirect
137136
gopkg.in/yaml.v3 v3.0.1 // indirect
138-
k8s.io/apiextensions-apiserver v0.26.1 // indirect
139-
k8s.io/cli-runtime v0.25.4 // indirect
140-
k8s.io/component-base v0.26.3 // indirect
141-
k8s.io/klog/v2 v2.90.1 // indirect
137+
k8s.io/apiextensions-apiserver v0.27.2 // indirect
138+
k8s.io/cli-runtime v0.27.2 // indirect
139+
k8s.io/component-base v0.27.2 // indirect
140+
k8s.io/klog/v2 v2.100.1 // indirect
142141
k8s.io/kubectl v0.25.4 // indirect
143-
k8s.io/utils v0.0.0-20230313181309-38a27ef9d749 // indirect
144142
sigs.k8s.io/cli-utils v0.34.0 // indirect
145143
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
146-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
144+
sigs.k8s.io/kustomize/api v0.13.4 // indirect
147145
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
148146
sigs.k8s.io/yaml v1.3.0 // indirect
149147
)

0 commit comments

Comments
 (0)