Skip to content

Commit cb4fbdc

Browse files
joaopapereirajoaopapereira
authored
Merge pull request #1833 from sameerforge/bump-oss-deps
chore(deps): bump golang.org/x/mod to latest
2 parents 55f0817 + 7723572 commit cb4fbdc

44 files changed

Lines changed: 525 additions & 2372 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎go.mod‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ module carvel.dev/kapp-controller
33
go 1.26.3
44

55
require (
6-
carvel.dev/vendir v0.45.3
6+
carvel.dev/vendir v0.45.4
77
github.com/fatih/color v1.18.0 // indirect
88
github.com/gogo/protobuf v1.3.2
99
github.com/prometheus/client_golang v1.23.2
1010
github.com/stretchr/testify v1.11.1
1111
golang.org/x/crypto v0.50.0
1212
golang.org/x/text v0.36.0 // indirect
13-
golang.org/x/tools v0.43.0
13+
golang.org/x/tools v0.44.0
1414
k8s.io/api v0.36.0
1515
k8s.io/apimachinery v0.36.0
1616
k8s.io/apiserver v0.36.0
@@ -24,8 +24,8 @@ require (
2424
)
2525

2626
require (
27-
github.com/blang/semver v3.5.1+incompatible
28-
github.com/carvel-dev/semver/v4 v4.0.1-0.20260413160702-f136b2e8bf02
27+
github.com/blang/semver/v4 v4.0.0
28+
github.com/carvel-dev/semver/v4 v4.0.1
2929
github.com/cppforlife/go-cli-ui v0.0.0-20220520125801-e45d9169a663
3030
github.com/go-logr/logr v1.4.3
3131
github.com/prometheus/client_model v0.6.2
@@ -42,7 +42,6 @@ require (
4242
github.com/NYTimes/gziphandler v1.1.1 // indirect
4343
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
4444
github.com/beorn7/perks v1.0.1 // indirect
45-
github.com/blang/semver/v4 v4.0.0 // indirect
4645
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
4746
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4847
github.com/coreos/go-semver v0.3.1 // indirect
@@ -103,11 +102,11 @@ require (
103102
go.uber.org/zap v1.27.1 // indirect
104103
go.yaml.in/yaml/v3 v3.0.4 // indirect
105104
golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 // indirect
106-
golang.org/x/mod v0.34.0 // indirect
107-
golang.org/x/net v0.52.0 // indirect
105+
golang.org/x/mod v0.36.0 // indirect
106+
golang.org/x/net v0.53.0 // indirect
108107
golang.org/x/oauth2 v0.34.0 // indirect
109-
golang.org/x/sys v0.43.0 // indirect
110-
golang.org/x/telemetry v0.0.0-20260311193753-579e4da9a98c // indirect
108+
golang.org/x/sys v0.44.0 // indirect
109+
golang.org/x/telemetry v0.0.0-20260409153401-be6f6cb8b1fa // indirect
111110
golang.org/x/term v0.42.0 // indirect
112111
golang.org/x/time v0.14.0 // indirect
113112
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect

‎go.sum‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
carvel.dev/vendir v0.45.3 h1:crIwlGpsdvABTiUM71IbAaanavyET7+FhnI8hrd3x3U=
2-
carvel.dev/vendir v0.45.3/go.mod h1:ulOigkUjXfCYidNbHqNAtEf0MFnuwG4jhoEqG2giOnU=
1+
carvel.dev/vendir v0.45.4 h1:FO6JVnr0aA0Qd8Ews2baIjYRAejyBSxVvLMuSqVvwTk=
2+
carvel.dev/vendir v0.45.4/go.mod h1:ArnuY2g3wXtY4okBnJ4PpU7GyJGTot0w9hsuwXP0Rvw=
33
cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=
44
cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
55
github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
@@ -10,12 +10,10 @@ github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8
1010
github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g=
1111
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
1212
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
13-
github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
14-
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
1513
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
1614
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
17-
github.com/carvel-dev/semver/v4 v4.0.1-0.20260413160702-f136b2e8bf02 h1:LP+GFDwgIBQFld1EhQt3UaN1typu03sqU3eWCKM5Isk=
18-
github.com/carvel-dev/semver/v4 v4.0.1-0.20260413160702-f136b2e8bf02/go.mod h1:4cFTBLAr/U11ykiEEQMccu4uJ1i0GS+atJmeETHCFtI=
15+
github.com/carvel-dev/semver/v4 v4.0.1 h1:tGL+KPLJ/fnZTz7ssct0PO+HmiJLZYG+h6Im7KMcNFY=
16+
github.com/carvel-dev/semver/v4 v4.0.1/go.mod h1:4cFTBLAr/U11ykiEEQMccu4uJ1i0GS+atJmeETHCFtI=
1917
github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=
2018
github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
2119
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
@@ -186,8 +184,8 @@ github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0t
186184
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
187185
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
188186
github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
189-
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
190-
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
187+
github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=
188+
github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=
191189
github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=
192190
github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0=
193191
github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
@@ -273,16 +271,16 @@ golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 h1:fQsdNF2N+/YewlRZiricy4P1i
273271
golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93/go.mod h1:EPRbTFwzwjXj9NpYyyrvenVh9Y+GFeEvMNh7Xuz7xgU=
274272
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
275273
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
276-
golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI=
277-
golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY=
274+
golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4=
275+
golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ=
278276
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
279277
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
280278
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
281279
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
282280
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
283281
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
284-
golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
285-
golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
282+
golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA=
283+
golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
286284
golang.org/x/oauth2 v0.34.0 h1:hqK/t4AKgbqWkdkcAeI8XLmbK+4m4G5YeQRrmiotGlw=
287285
golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
288286
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -304,10 +302,10 @@ golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7w
304302
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
305303
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
306304
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
307-
golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
308-
golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
309-
golang.org/x/telemetry v0.0.0-20260311193753-579e4da9a98c h1:6a8FdnNk6bTXBjR4AGKFgUKuo+7GnR3FX5L7CbveeZc=
310-
golang.org/x/telemetry v0.0.0-20260311193753-579e4da9a98c/go.mod h1:TpUTTEp9frx7rTdLpC9gFG9kdI7zVLFTFFlqaH2Cncw=
305+
golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
306+
golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
307+
golang.org/x/telemetry v0.0.0-20260409153401-be6f6cb8b1fa h1:efT73AJZfAAUV7SOip6pWGkwJDzIGiKBZGVzHYa+ve4=
308+
golang.org/x/telemetry v0.0.0-20260409153401-be6f6cb8b1fa/go.mod h1:kHjTxDEnAu6/Nl9lDkzjWpR+bmKfxeiRuSDlsMb70gE=
311309
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
312310
golang.org/x/term v0.42.0 h1:UiKe+zDFmJobeJ5ggPwOshJIVt6/Ft0rcfrXZDLWAWY=
313311
golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY=
@@ -322,8 +320,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
322320
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
323321
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
324322
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
325-
golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s=
326-
golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0=
323+
golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c=
324+
golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI=
327325
golang.org/x/tools/go/expect v0.1.1-deprecated h1:jpBZDwmgPhXsKZC6WhL20P4b/wmnpsEAGHaNy0n/rJM=
328326
golang.org/x/tools/go/expect v0.1.1-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY=
329327
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated h1:1h2MnaIAIXISqTFKdENegdpAgUXz6NrPEsbIeWaBRvM=

‎hack/dependencies.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"strings"
2424
"text/template"
2525

26-
"github.com/blang/semver"
26+
"github.com/blang/semver/v4"
2727
"github.com/spf13/cobra"
2828
"golang.org/x/sync/errgroup"
2929
"sigs.k8s.io/yaml"

‎hack/dependencies.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
- checksums:
22
darwin:
3-
amd64: 6218426752505fffce393a18eb700e7ddb2ddcc1c8ad521d02101bdb9db2f7f6
4-
arm64: 76c2d8f958568ceabe927d32206d79b779bd8341450d99b78d028ae608d1348b
3+
amd64: b6a946878b74883c093bcc3e93960c68a6058a7e2be6ee2c78f1ba5f80fe3c02
4+
arm64: cf4d4afcf32e5cab1ba55a74f436c7e4bd04326c168a11be17078162629100e9
55
linux:
6-
amd64: 013adf9ed2fbd392b9861e5ec34015dabfcfa2e82da9e8cc0ee1e5c6a7f9b64b
7-
arm64: 14e0a83a793c04bd26b2a2328f6df169b38ddf24257a64ffde23038f4ecab0bf
6+
amd64: 3a2c925ed222f8db4956946d40279688edd6ceb3e919f03f919a8fc8b8532eda
7+
arm64: ce61f7aee3f66f9b78d5781ef8528b7c8e199a2747796ef17a954118d3e65724
88
dev: true
99
name: ytt
1010
repo: vmware-tanzu/carvel-ytt
1111
urlTemplate: https://github.com/vmware-tanzu/carvel-{{.Name}}/releases/download/{{.Version}}/{{.Name}}-{{.OS}}-{{.Arch}}
12-
version: v0.55.0
12+
version: v0.55.1
1313
- checksums:
1414
darwin:
15-
amd64: 950ecd6562fe99df46dd34f7b32706ef2583a428fb4f1c7563f29bd97b5082f2
16-
arm64: 2360e61e8a96215ec4d5b0ee7620b2942e17a157caadd086a540c57552ac6a48
15+
amd64: fc0909f8a77f737cc075fc2e9dbf70408e00e933015863569dbd17a020e6fc06
16+
arm64: a9ed7e4fbce8fa714357458d29cea0664a00d403415f47e700fbc3b7d951f561
1717
linux:
18-
amd64: 52521ed5eebdddc2e7c7dc04da775270677a450f958198d0c26b3cb011f58a29
19-
arm64: 8f94aecad48df7ee99fa347eb24efad71ae0fb6ae3be03677a3c7d1ead359f1d
18+
amd64: 9e417cb47dbf484cbf2a9f10b6a43186d2dded3597102de3f47f1d2989669884
19+
arm64: 27cc0137f0b7c71e0ebe924ace785b6e25b27c809c7db8d39f880c1864c191cc
2020
dev: true
2121
name: kbld
2222
repo: vmware-tanzu/carvel-kbld
2323
urlTemplate: https://github.com/vmware-tanzu/carvel-{{.Name}}/releases/download/{{.Version}}/{{.Name}}-{{.OS}}-{{.Arch}}
24-
version: v0.48.0
24+
version: v0.48.1
2525
- checksums:
2626
darwin:
2727
amd64: cebb31f6b72cd94dc4e1c17b31ba6e4ac70caeb53e4b29aea1fbc1885605e9a7
@@ -36,16 +36,16 @@
3636
version: v0.65.3
3737
- checksums:
3838
darwin:
39-
amd64: 52a584cf8c9c97b0f9693f33e404b971f3f65bff3a136d979d7b92c8a8f5cf62
40-
arm64: 4c27422b42a83ed598e5548542c0cd19d185002f6d4ae8e12d59df27ebcdf572
39+
amd64: 39042d2ce50e2277ce262596943ebaba4a94302bb1763bde75255029018d731e
40+
arm64: e0e3c327888c5ed6bec69a8cfc8a8fd978e2790078b42ee48d3015be5e499899
4141
linux:
42-
amd64: 7dc6dd9706170b442a7aaf3b4e29da57cca722a3252ed8f6ac9c2997e93a0aa5
43-
arm64: cb951dedcf2e64d8d76cb9c205d13ce78f6a8802a74caa1205ec47bc9f2dac65
42+
amd64: b71189f46b26facc6d5baeae8047fe49afd899f8125818275241a084aa2c08a1
43+
arm64: 25847a9d58c44cca6f486d7c31199a2a2e15bc1be1e8adafae66a01411ea222e
4444
dev: true
4545
name: vendir
4646
repo: carvel-dev/vendir
4747
urlTemplate: https://github.com/carvel-dev/{{.Name}}/releases/download/{{.Version}}/{{.Name}}-{{.OS}}-{{.Arch}}
48-
version: v0.45.3
48+
version: v0.45.4
4949
- checksums:
5050
linux:
5151
amd64: a0a5e8c592ed3f376ac110715eff214730c7422f9a44d96cf98117d2b8b0e6c0

‎vendor/github.com/blang/semver/.travis.yml‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎vendor/github.com/blang/semver/LICENSE‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)