Skip to content

Commit a69857e

Browse files
committed
Update Kubernetes, controller-runtime and Helm
This commit updates Kubernetes to v1.27, controller-runtime to v0.15, and Helm to v3.12. It 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. - Max concurrent reconciles 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 available are updated to their latest versions as well. Signed-off-by: Hidde Beydals <hidde@hhh.computer>
1 parent e8e2d41 commit a69857e

File tree

5 files changed

+157
-200
lines changed

5 files changed

+157
-200
lines changed

go.mod

+36-37
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,41 @@ replace github.com/fluxcd/helm-controller/api => ./api
77
require (
88
github.com/fluxcd/helm-controller/api v0.33.0
99
github.com/fluxcd/pkg/apis/acl v0.1.0
10-
github.com/fluxcd/pkg/apis/event v0.4.1
11-
github.com/fluxcd/pkg/apis/kustomize v1.0.0
12-
github.com/fluxcd/pkg/apis/meta v1.0.0
13-
github.com/fluxcd/pkg/runtime v0.35.0
14-
github.com/fluxcd/pkg/ssa v0.27.0
10+
github.com/fluxcd/pkg/apis/event v0.5.0
11+
github.com/fluxcd/pkg/apis/kustomize v1.1.0
12+
github.com/fluxcd/pkg/apis/meta v1.1.0
13+
github.com/fluxcd/pkg/runtime v0.38.1
14+
github.com/fluxcd/pkg/ssa v0.28.1
1515
github.com/fluxcd/source-controller/api v1.0.0-rc.3
1616
github.com/go-logr/logr v1.2.4
1717
github.com/google/go-cmp v0.5.9
1818
github.com/hashicorp/go-retryablehttp v0.7.2
19-
github.com/onsi/gomega v1.27.6
19+
github.com/onsi/gomega v1.27.7
2020
github.com/opencontainers/go-digest v1.0.0
21-
github.com/opencontainers/go-digest/blake3 v0.0.0-20220411205349-bde1400a84be
21+
github.com/opencontainers/go-digest/blake3 v0.0.0-20230329235805-65fac7b55eb7
2222
github.com/spf13/pflag v1.0.5
2323
gopkg.in/yaml.v2 v2.4.0
24-
helm.sh/helm/v3 v3.11.3
25-
k8s.io/api v0.26.3
26-
k8s.io/apiextensions-apiserver v0.26.3
27-
k8s.io/apimachinery v0.26.3
28-
k8s.io/cli-runtime v0.26.3
29-
k8s.io/client-go v0.26.3
24+
helm.sh/helm/v3 v3.12.0
25+
k8s.io/api v0.27.2
26+
k8s.io/apiextensions-apiserver v0.27.2
27+
k8s.io/apimachinery v0.27.2
28+
k8s.io/cli-runtime v0.27.2
29+
k8s.io/client-go v0.27.2
30+
k8s.io/utils v0.0.0-20230505201702-9f6742963106
3031
sigs.k8s.io/cli-utils v0.34.0
31-
sigs.k8s.io/controller-runtime v0.14.6
32-
sigs.k8s.io/kustomize/api v0.12.1
32+
sigs.k8s.io/controller-runtime v0.15.0
33+
sigs.k8s.io/kustomize/api v0.13.4
3334
sigs.k8s.io/yaml v1.3.0
3435
)
3536

3637
// Replace digest lib to master to gather access to BLAKE3.
3738
// xref: https://github.com/opencontainers/go-digest/pull/66
3839
replace github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.1-0.20220411205349-bde1400a84be
3940

40-
// Pin kustomize to v4.5.7
41+
// Pin kustomize to v5.0.3
4142
replace (
42-
sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.12.1
43-
sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.13.9
43+
sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.13.4
44+
sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.14.2
4445
)
4546

4647
require (
@@ -75,7 +76,7 @@ require (
7576
github.com/go-errors/errors v1.4.2 // indirect
7677
github.com/go-gorp/gorp/v3 v3.0.5 // indirect
7778
github.com/go-logr/stdr v1.2.2 // indirect
78-
github.com/go-logr/zapr v1.2.3 // indirect
79+
github.com/go-logr/zapr v1.2.4 // indirect
7980
github.com/go-openapi/jsonpointer v0.19.6 // indirect
8081
github.com/go-openapi/jsonreference v0.20.1 // indirect
8182
github.com/go-openapi/swag v0.22.3 // indirect
@@ -124,10 +125,10 @@ require (
124125
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
125126
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
126127
github.com/pkg/errors v0.9.1 // indirect
127-
github.com/prometheus/client_golang v1.14.0 // indirect
128-
github.com/prometheus/client_model v0.3.0 // indirect
129-
github.com/prometheus/common v0.37.0 // indirect
130-
github.com/prometheus/procfs v0.8.0 // indirect
128+
github.com/prometheus/client_golang v1.15.1 // indirect
129+
github.com/prometheus/client_model v0.4.0 // indirect
130+
github.com/prometheus/common v0.42.0 // indirect
131+
github.com/prometheus/procfs v0.9.0 // indirect
131132
github.com/rubenv/sql-migrate v1.3.1 // indirect
132133
github.com/russross/blackfriday/v2 v2.1.0 // indirect
133134
github.com/shopspring/decimal v1.3.1 // indirect
@@ -146,29 +147,27 @@ require (
146147
go.uber.org/multierr v1.8.0 // indirect
147148
go.uber.org/zap v1.24.0 // indirect
148149
golang.org/x/crypto v0.5.0 // indirect
149-
golang.org/x/net v0.8.0 // indirect
150-
golang.org/x/oauth2 v0.4.0 // indirect
150+
golang.org/x/net v0.10.0 // indirect
151+
golang.org/x/oauth2 v0.5.0 // indirect
151152
golang.org/x/sync v0.1.0 // indirect
152-
golang.org/x/sys v0.6.0 // indirect
153-
golang.org/x/term v0.6.0 // indirect
153+
golang.org/x/sys v0.8.0 // indirect
154+
golang.org/x/term v0.8.0 // indirect
154155
golang.org/x/text v0.9.0 // indirect
155156
golang.org/x/time v0.3.0 // indirect
156-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
157+
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
157158
google.golang.org/appengine v1.6.7 // indirect
158159
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
159160
google.golang.org/grpc v1.53.0 // indirect
160-
google.golang.org/protobuf v1.28.1 // indirect
161+
google.golang.org/protobuf v1.30.0 // indirect
161162
gopkg.in/inf.v0 v0.9.1 // indirect
162163
gopkg.in/yaml.v3 v3.0.1 // indirect
163-
gotest.tools/v3 v3.4.0 // indirect
164-
k8s.io/apiserver v0.26.3 // indirect
165-
k8s.io/component-base v0.26.3 // indirect
166-
k8s.io/klog/v2 v2.90.1 // indirect
167-
k8s.io/kube-openapi v0.0.0-20221110221610-a28e98eb7c70 // indirect
168-
k8s.io/kubectl v0.26.0 // indirect
169-
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect
164+
k8s.io/apiserver v0.27.2 // indirect
165+
k8s.io/component-base v0.27.2 // indirect
166+
k8s.io/klog/v2 v2.100.1 // indirect
167+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
168+
k8s.io/kubectl v0.27.1 // indirect
170169
oras.land/oras-go v1.2.2 // indirect
171170
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
172-
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
171+
sigs.k8s.io/kustomize/kyaml v0.14.2 // indirect
173172
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
174173
)

0 commit comments

Comments
 (0)