Skip to content

Commit cca1d3a

Browse files
hiddecohiddeco
authored
Merge pull request #839 from fluxcd/update-deps
Update Kustomize to v5.3.0
2 parents 2586fdd + c44d615 commit cca1d3a

File tree

4 files changed

+67
-69
lines changed

4 files changed

+67
-69
lines changed

‎api/go.mod

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ require (
1212
)
1313

1414
require (
15-
github.com/go-logr/logr v1.2.4 // indirect
15+
github.com/go-logr/logr v1.3.0 // indirect
1616
github.com/gogo/protobuf v1.3.2 // indirect
1717
github.com/google/gofuzz v1.2.0 // indirect
1818
github.com/json-iterator/go v1.1.12 // indirect
1919
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2020
github.com/modern-go/reflect2 v1.0.2 // indirect
21-
golang.org/x/net v0.17.0 // indirect
22-
golang.org/x/text v0.13.0 // indirect
21+
golang.org/x/net v0.19.0 // indirect
22+
golang.org/x/text v0.14.0 // indirect
2323
gopkg.in/inf.v0 v0.9.1 // indirect
2424
gopkg.in/yaml.v2 v2.4.0 // indirect
25-
k8s.io/klog/v2 v2.100.1 // indirect
26-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
25+
k8s.io/klog/v2 v2.110.1 // indirect
26+
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
2727
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
28-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
28+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
2929
)

‎api/go.sum

+13-14
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ github.com/fluxcd/pkg/apis/kustomize v1.2.0 h1:vkVs+OumxaWso0jNCqdgFFfMHdh+qtZhy
55
github.com/fluxcd/pkg/apis/kustomize v1.2.0/go.mod h1:VF7tR/WuVFeum+HaMTHwp+eCtsHiiQlY6ihgqtAnW/M=
66
github.com/fluxcd/pkg/apis/meta v1.2.0 h1:O766PzGAdMdQKybSflGL8oV0+GgCNIkdsxfalRyzeO8=
77
github.com/fluxcd/pkg/apis/meta v1.2.0/go.mod h1:fU/Az9AoVyIxC0oI4ihG0NVMNnvrcCzdEym3wxjIQsc=
8-
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
9-
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
10-
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
8+
github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
9+
github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
1110
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
1211
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
1312
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
@@ -48,19 +47,19 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
4847
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
4948
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
5049
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
51-
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
52-
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
50+
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
51+
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
5352
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5453
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5554
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5655
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
5756
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
5857
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
59-
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
58+
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
6059
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
6160
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
62-
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
63-
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
61+
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
62+
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
6463
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
6564
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
6665
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -83,15 +82,15 @@ k8s.io/apiextensions-apiserver v0.28.4 h1:AZpKY/7wQ8n+ZYDtNHbAJBb+N4AXXJvyZx6ww6
8382
k8s.io/apiextensions-apiserver v0.28.4/go.mod h1:pgQIZ1U8eJSMQcENew/0ShUTlePcSGFq6dxSxf2mwPM=
8483
k8s.io/apimachinery v0.28.4 h1:zOSJe1mc+GxuMnFzD4Z/U1wst50X28ZNsn5bhgIIao8=
8584
k8s.io/apimachinery v0.28.4/go.mod h1:wI37ncBvfAoswfq626yPTe6Bz1c22L7uaJ8dho83mgg=
86-
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
87-
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
88-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
89-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
85+
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
86+
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
87+
k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6RxQGZDnzuLcrUTI=
88+
k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
9089
sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4=
9190
sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0=
9291
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
9392
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
94-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
95-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
93+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
94+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
9695
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
9796
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

‎go.mod

+17-17
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ replace github.com/fluxcd/helm-controller/api => ./api
88
// xref: https://github.com/opencontainers/go-digest/pull/66
99
replace github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.1-0.20231025023718-d50d2fec9c98
1010

11-
// Pin kustomize to v5.2.1
11+
// Pin kustomize to v5.3.0
1212
replace (
13-
sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.15.0
14-
sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.15.0
13+
sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.16.0
14+
sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.16.0
1515
)
1616

1717
require (
18-
github.com/fluxcd/cli-utils v0.36.0-flux.1
18+
github.com/fluxcd/cli-utils v0.36.0-flux.2
1919
github.com/fluxcd/helm-controller/api v0.36.2
2020
github.com/fluxcd/pkg/apis/acl v0.1.0
2121
github.com/fluxcd/pkg/apis/event v0.6.0
2222
github.com/fluxcd/pkg/apis/kustomize v1.2.0
2323
github.com/fluxcd/pkg/apis/meta v1.2.0
24-
github.com/fluxcd/pkg/runtime v0.43.0
24+
github.com/fluxcd/pkg/runtime v0.43.1
2525
github.com/fluxcd/pkg/ssa v0.35.0
2626
github.com/fluxcd/pkg/testserver v0.5.0
2727
github.com/fluxcd/source-controller/api v1.2.1
@@ -42,10 +42,10 @@ require (
4242
k8s.io/cli-runtime v0.28.4
4343
k8s.io/client-go v0.28.4
4444
k8s.io/kubectl v0.28.4
45-
k8s.io/utils v0.0.0-20231121161247-cf03d44ff3cf
45+
k8s.io/utils v0.0.0-20231127182322-b307cd553661
4646
sigs.k8s.io/controller-runtime v0.16.3
47-
sigs.k8s.io/kustomize/api v0.15.0
48-
sigs.k8s.io/kustomize/kyaml v0.15.0
47+
sigs.k8s.io/kustomize/api v0.16.0
48+
sigs.k8s.io/kustomize/kyaml v0.16.0
4949
sigs.k8s.io/yaml v1.4.0
5050
)
5151

@@ -79,7 +79,7 @@ require (
7979
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
8080
github.com/fatih/color v1.13.0 // indirect
8181
github.com/fsnotify/fsnotify v1.6.0 // indirect
82-
github.com/go-errors/errors v1.4.2 // indirect
82+
github.com/go-errors/errors v1.5.1 // indirect
8383
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
8484
github.com/go-logr/stdr v1.2.2 // indirect
8585
github.com/go-logr/zapr v1.2.4 // indirect
@@ -153,14 +153,14 @@ require (
153153
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
154154
go.uber.org/multierr v1.11.0 // indirect
155155
go.uber.org/zap v1.25.0 // indirect
156-
golang.org/x/crypto v0.15.0 // indirect
156+
golang.org/x/crypto v0.16.0 // indirect
157157
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
158-
golang.org/x/net v0.18.0 // indirect
159-
golang.org/x/oauth2 v0.14.0 // indirect
158+
golang.org/x/net v0.19.0 // indirect
159+
golang.org/x/oauth2 v0.15.0 // indirect
160160
golang.org/x/sync v0.5.0 // indirect
161-
golang.org/x/sys v0.14.0 // indirect
162-
golang.org/x/term v0.14.0 // indirect
163-
golang.org/x/time v0.4.0 // indirect
161+
golang.org/x/sys v0.15.0 // indirect
162+
golang.org/x/term v0.15.0 // indirect
163+
golang.org/x/time v0.5.0 // indirect
164164
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
165165
google.golang.org/appengine v1.6.7 // indirect
166166
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
@@ -172,8 +172,8 @@ require (
172172
gopkg.in/yaml.v3 v3.0.1 // indirect
173173
k8s.io/apiserver v0.28.4 // indirect
174174
k8s.io/component-base v0.28.4 // indirect
175-
k8s.io/klog/v2 v2.100.1 // indirect
176-
k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e // indirect
175+
k8s.io/klog/v2 v2.110.1 // indirect
176+
k8s.io/kube-openapi v0.0.0-20231206194836-bf4651e18aa8 // indirect
177177
oras.land/oras-go v1.2.4 // indirect
178178
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
179179
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)