Skip to content

Commit 61f2df3

Browse files
stefanprodanstefanprodan
authored
Merge pull request #673 from fluxcd/kubernetes-1.30
Update dependencies to Kubernetes 1.30
2 parents 192ca62 + e77694c commit 61f2df3

File tree

2 files changed

+135
-140
lines changed

2 files changed

+135
-140
lines changed

‎go.mod

+47-46
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module github.com/fluxcd/terraform-provider-flux
22

3-
go 1.22
3+
go 1.22.0
44

5-
// Pin kustomize to v5.3.0
5+
// Pin kustomize to v5.4.0
66
replace (
7-
sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.16.0
8-
sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.16.0
7+
sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.17.0
8+
sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.17.0
99
)
1010

1111
// Fix CVE-2022-28948
@@ -16,19 +16,19 @@ require (
1616
github.com/ProtonMail/go-crypto v1.0.0
1717
github.com/docker/docker v24.0.9+incompatible
1818
github.com/docker/go-connections v0.4.0
19-
github.com/fluxcd/cli-utils v0.36.0-flux.4
19+
github.com/fluxcd/cli-utils v0.36.0-flux.7
2020
github.com/fluxcd/flux2/v2 v2.2.3
2121
github.com/fluxcd/helm-controller/api v0.37.4
2222
github.com/fluxcd/image-automation-controller/api v0.37.1
2323
github.com/fluxcd/image-reflector-controller/api v0.31.2
2424
github.com/fluxcd/kustomize-controller/api v1.2.2
2525
github.com/fluxcd/notification-controller/api v1.2.4
26-
github.com/fluxcd/pkg/apis/meta v1.4.0
27-
github.com/fluxcd/pkg/git v0.18.0
28-
github.com/fluxcd/pkg/git/gogit v0.18.0
29-
github.com/fluxcd/pkg/runtime v0.45.0
30-
github.com/fluxcd/pkg/ssa v0.37.0
31-
github.com/fluxcd/pkg/ssh v0.12.0
26+
github.com/fluxcd/pkg/apis/meta v1.5.0
27+
github.com/fluxcd/pkg/git v0.19.0
28+
github.com/fluxcd/pkg/git/gogit v0.19.0
29+
github.com/fluxcd/pkg/runtime v0.47.0
30+
github.com/fluxcd/pkg/ssa v0.39.0
31+
github.com/fluxcd/pkg/ssh v0.13.0
3232
github.com/fluxcd/source-controller/api v1.2.4
3333
github.com/go-logr/logr v1.4.1
3434
github.com/google/go-containerregistry v0.19.1
@@ -43,14 +43,14 @@ require (
4343
github.com/mitchellh/go-homedir v1.1.0
4444
github.com/otiai10/copy v1.14.0
4545
github.com/stretchr/testify v1.9.0
46-
k8s.io/api v0.29.3
47-
k8s.io/apiextensions-apiserver v0.29.3
48-
k8s.io/apimachinery v0.29.3
49-
k8s.io/cli-runtime v0.29.3
50-
k8s.io/client-go v0.29.3
51-
sigs.k8s.io/controller-runtime v0.17.2
46+
k8s.io/api v0.30.0
47+
k8s.io/apiextensions-apiserver v0.30.0
48+
k8s.io/apimachinery v0.30.0
49+
k8s.io/cli-runtime v0.30.0
50+
k8s.io/client-go v0.30.0
51+
sigs.k8s.io/controller-runtime v0.18.0
5252
sigs.k8s.io/kind v0.22.0
53-
sigs.k8s.io/kustomize/api v0.16.0
53+
sigs.k8s.io/kustomize/api v0.17.1
5454
sigs.k8s.io/yaml v1.4.0
5555
)
5656

@@ -69,35 +69,36 @@ require (
6969
github.com/armon/go-radix v1.0.0 // indirect
7070
github.com/beorn7/perks v1.0.1 // indirect
7171
github.com/bgentry/speakeasy v0.1.0 // indirect
72-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
72+
github.com/blang/semver/v4 v4.0.0 // indirect
73+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7374
github.com/chai2010/gettext-go v1.0.2 // indirect
7475
github.com/cloudflare/circl v1.3.7 // indirect
7576
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
76-
github.com/davecgh/go-spew v1.1.1 // indirect
77+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7778
github.com/davidmz/go-pageant v1.0.2 // indirect
7879
github.com/docker/distribution v2.8.2+incompatible // indirect
7980
github.com/docker/go-units v0.5.0 // indirect
80-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
81+
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
8182
github.com/emirpasic/gods v1.18.1 // indirect
8283
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
83-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
84+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
8485
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
8586
github.com/fatih/color v1.13.0 // indirect
8687
github.com/fluxcd/go-git-providers v0.20.0 // indirect
87-
github.com/fluxcd/pkg/apis/acl v0.2.0 // indirect
88+
github.com/fluxcd/pkg/apis/acl v0.3.0 // indirect
8889
github.com/fluxcd/pkg/apis/kustomize v1.3.0 // indirect
8990
github.com/fluxcd/pkg/kustomize v1.6.0 // indirect
9091
github.com/fluxcd/pkg/tar v0.4.0 // indirect
91-
github.com/fluxcd/pkg/version v0.3.0 // indirect
92+
github.com/fluxcd/pkg/version v0.4.0 // indirect
9293
github.com/fsnotify/fsnotify v1.7.0 // indirect
9394
github.com/go-errors/errors v1.5.1 // indirect
9495
github.com/go-fed/httpsig v1.1.0 // indirect
9596
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
9697
github.com/go-git/go-billy/v5 v5.5.0 // indirect
9798
github.com/go-git/go-git/v5 v5.12.0 // indirect
98-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
99-
github.com/go-openapi/jsonreference v0.20.2 // indirect
100-
github.com/go-openapi/swag v0.22.4 // indirect
99+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
100+
github.com/go-openapi/jsonreference v0.21.0 // indirect
101+
github.com/go-openapi/swag v0.23.0 // indirect
101102
github.com/gogo/protobuf v1.3.2 // indirect
102103
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
103104
github.com/golang/protobuf v1.5.4 // indirect
@@ -162,12 +163,12 @@ require (
162163
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
163164
github.com/pjbgf/sha1cd v0.3.0 // indirect
164165
github.com/pkg/errors v0.9.1 // indirect
165-
github.com/pmezard/go-difflib v1.0.0 // indirect
166+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
166167
github.com/posener/complete v1.2.3 // indirect
167168
github.com/prometheus/client_golang v1.19.0 // indirect
168-
github.com/prometheus/client_model v0.5.0 // indirect
169-
github.com/prometheus/common v0.48.0 // indirect
170-
github.com/prometheus/procfs v0.12.0 // indirect
169+
github.com/prometheus/client_model v0.6.1 // indirect
170+
github.com/prometheus/common v0.53.0 // indirect
171+
github.com/prometheus/procfs v0.14.0 // indirect
171172
github.com/russross/blackfriday v1.6.0 // indirect
172173
github.com/russross/blackfriday/v2 v2.1.0 // indirect
173174
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
@@ -184,33 +185,33 @@ require (
184185
github.com/xlab/treeprint v1.2.0 // indirect
185186
github.com/zclconf/go-cty v1.13.2 // indirect
186187
go.starlark.net v0.0.0-20231121155337-90ade8b19d09 // indirect
187-
golang.org/x/crypto v0.21.0 // indirect
188-
golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect
189-
golang.org/x/mod v0.16.0 // indirect
190-
golang.org/x/net v0.22.0 // indirect
191-
golang.org/x/oauth2 v0.18.0 // indirect
192-
golang.org/x/sync v0.6.0 // indirect
193-
golang.org/x/sys v0.18.0 // indirect
194-
golang.org/x/term v0.18.0 // indirect
188+
golang.org/x/crypto v0.22.0 // indirect
189+
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
190+
golang.org/x/mod v0.17.0 // indirect
191+
golang.org/x/net v0.24.0 // indirect
192+
golang.org/x/oauth2 v0.19.0 // indirect
193+
golang.org/x/sync v0.7.0 // indirect
194+
golang.org/x/sys v0.19.0 // indirect
195+
golang.org/x/term v0.19.0 // indirect
195196
golang.org/x/text v0.14.0 // indirect
196197
golang.org/x/time v0.5.0 // indirect
197-
golang.org/x/tools v0.19.0 // indirect
198+
golang.org/x/tools v0.20.0 // indirect
198199
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
199200
google.golang.org/appengine v1.6.8 // indirect
200201
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
201202
google.golang.org/grpc v1.59.0 // indirect
202203
google.golang.org/protobuf v1.33.0 // indirect
203-
gopkg.in/evanphx/json-patch.v5 v5.7.0 // indirect
204+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
204205
gopkg.in/inf.v0 v0.9.1 // indirect
205206
gopkg.in/warnings.v0 v0.1.2 // indirect
206207
gopkg.in/yaml.v2 v2.4.0 // indirect
207208
gopkg.in/yaml.v3 v3.0.1 // indirect
208-
k8s.io/component-base v0.29.3 // indirect
209-
k8s.io/klog/v2 v2.110.1 // indirect
210-
k8s.io/kube-openapi v0.0.0-20231206194836-bf4651e18aa8 // indirect
211-
k8s.io/kubectl v0.29.3 // indirect
209+
k8s.io/component-base v0.30.0 // indirect
210+
k8s.io/klog/v2 v2.120.1 // indirect
211+
k8s.io/kube-openapi v0.0.0-20240411171206-dc4e619f62f3 // indirect
212+
k8s.io/kubectl v0.30.0 // indirect
212213
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect
213214
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
214-
sigs.k8s.io/kustomize/kyaml v0.16.0 // indirect
215+
sigs.k8s.io/kustomize/kyaml v0.17.0 // indirect
215216
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
216217
)

0 commit comments

Comments
 (0)