Skip to content

Commit e13774b

Browse files
committed
chore(deps): migrate Helm library from v3 to v4
talm consumes the Helm library only as a template engine — a vendored fork of pkg/engine plus the chart types, loader, and strvals — never its release or install machinery. The v4 changes around server-side apply, kstatus, and release storage therefore do not apply here. The swap is not purely mechanical. The Helm v4 module requires k8s.io/api v0.36, which drops autoscaling/v2beta2 that fluxcd/pkg/ssa v0.70 still imports, so the whole k8s.io stack moves to v0.36.2 and fluxcd/pkg/ssa to v0.77 (which is already on v0.36 and no longer needs the removed package). Chart value and file types moved to pkg/chart/common in v4; the engine fork and its tests reference them there, with CoalesceValues now under pkg/chart/common/util. The golden snapshots render byte-for-byte identical on v4, confirming the generated Talos machine-config is unchanged for users. Assisted-By: Claude <[email protected]> Signed-off-by: Aleksei Sviridkin <[email protected]>
1 parent de043ee commit e13774b

9 files changed

Lines changed: 236 additions & 221 deletions

File tree

‎go.mod‎

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ go 1.26.3
44

55
// Kubernetes dependencies sharing the same version.
66
require (
7-
k8s.io/api v0.35.3
8-
k8s.io/apimachinery v0.35.3
9-
k8s.io/client-go v0.35.3
10-
k8s.io/component-base v0.35.3 // indirect
7+
k8s.io/api v0.36.2
8+
k8s.io/apimachinery v0.36.2
9+
k8s.io/client-go v0.36.2
10+
k8s.io/component-base v0.36.2 // indirect
1111
)
1212

1313
require (
@@ -74,16 +74,16 @@ require (
7474
go.etcd.io/etcd/client/v3 v3.6.10 // indirect
7575
go.etcd.io/etcd/etcdutl/v3 v3.6.10 // indirect
7676
go.uber.org/zap v1.27.1 // indirect
77-
golang.org/x/net v0.53.0 // indirect
77+
golang.org/x/net v0.56.0 // indirect
7878
golang.org/x/oauth2 v0.36.0 // indirect
79-
golang.org/x/sync v0.20.0 // indirect
80-
golang.org/x/sys v0.43.0
81-
golang.org/x/term v0.42.0
82-
golang.org/x/text v0.36.0 // indirect
79+
golang.org/x/sync v0.22.0 // indirect
80+
golang.org/x/sys v0.47.0
81+
golang.org/x/term v0.45.0
82+
golang.org/x/text v0.40.0 // indirect
8383
golang.org/x/time v0.15.0 // indirect
8484
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10 // indirect
8585
google.golang.org/grpc v1.80.0
86-
google.golang.org/protobuf v1.36.11
86+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af
8787
gopkg.in/yaml.v3 v3.0.1
8888
k8s.io/klog/v2 v2.140.0 // indirect
8989
sigs.k8s.io/hydrophone v0.7.0 // indirect
@@ -97,7 +97,7 @@ require (
9797
github.com/cockroachdb/errors v1.13.0
9898
github.com/gobwas/glob v0.2.3
9999
github.com/siderolabs/talos v1.12.6
100-
helm.sh/helm/v3 v3.20.2
100+
helm.sh/helm/v4 v4.2.3
101101
)
102102

103103
require (
@@ -112,7 +112,7 @@ require (
112112
github.com/AzureAD/microsoft-authentication-library-for-go v1.7.1 // indirect
113113
github.com/MakeNowJust/heredoc v1.0.0 // indirect
114114
github.com/Masterminds/goutils v1.1.1 // indirect
115-
github.com/Masterminds/semver/v3 v3.4.0 // indirect
115+
github.com/Masterminds/semver/v3 v3.5.0 // indirect
116116
github.com/ProtonMail/go-crypto v1.4.1 // indirect
117117
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
118118
github.com/ProtonMail/gopenpgp/v2 v2.10.0 // indirect
@@ -157,8 +157,8 @@ require (
157157
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
158158
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
159159
github.com/fatih/camelcase v1.0.0 // indirect
160-
github.com/fluxcd/cli-utils v1.0.0 // indirect
161-
github.com/fluxcd/pkg/ssa v0.70.0 // indirect
160+
github.com/fluxcd/cli-utils v1.2.2 // indirect
161+
github.com/fluxcd/pkg/ssa v0.77.0 // indirect
162162
github.com/fxamacker/cbor/v2 v2.9.1 // indirect
163163
github.com/gdamore/encoding v1.0.1 // indirect
164164
github.com/getsentry/sentry-go v0.46.0 // indirect
@@ -193,7 +193,6 @@ require (
193193
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
194194
github.com/gosuri/uilive v0.0.4 // indirect
195195
github.com/gosuri/uiprogress v0.0.1 // indirect
196-
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
197196
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
198197
github.com/hashicorp/errwrap v1.1.0 // indirect
199198
github.com/hexops/gotextdiff v1.0.3 // indirect
@@ -221,7 +220,6 @@ require (
221220
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
222221
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
223222
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
224-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
225223
github.com/nsf/termbox-go v1.1.1 // indirect
226224
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
227225
github.com/petermattis/goid v0.0.0-20260330135022-df67b199bc81 // indirect
@@ -245,7 +243,12 @@ require (
245243
github.com/spf13/cast v1.10.0 // indirect
246244
github.com/spyzhov/ajson v0.9.6 // indirect
247245
github.com/stretchr/objx v0.5.3 // indirect
246+
github.com/tidwall/gjson v1.18.0 // indirect
247+
github.com/tidwall/match v1.1.1 // indirect
248+
github.com/tidwall/pretty v1.2.1 // indirect
249+
github.com/tidwall/sjson v1.2.5 // indirect
248250
github.com/vbatts/tar-split v0.12.2 // indirect
251+
github.com/wI2L/jsondiff v0.6.1 // indirect
249252
github.com/x448/float16 v0.8.4 // indirect
250253
github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect
251254
github.com/xlab/treeprint v1.2.0 // indirect
@@ -263,21 +266,22 @@ require (
263266
go.yaml.in/yaml/v2 v2.4.4 // indirect
264267
go.yaml.in/yaml/v3 v3.0.4 // indirect
265268
go.yaml.in/yaml/v4 v4.0.0-rc.4 // indirect
266-
golang.org/x/crypto v0.50.0 // indirect
269+
golang.org/x/crypto v0.54.0 // indirect
267270
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f // indirect
268271
google.golang.org/genproto/googleapis/api v0.0.0-20260406210006-6f92a3bedf2d // indirect
269272
google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d // indirect
270273
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
271274
gopkg.in/inf.v0 v0.9.1 // indirect
272275
gopkg.in/yaml.v2 v2.4.0 // indirect
273-
k8s.io/apiextensions-apiserver v0.35.3 // indirect
274-
k8s.io/cli-runtime v0.35.3 // indirect
275-
k8s.io/component-helpers v0.35.3 // indirect
276+
k8s.io/apiextensions-apiserver v0.36.2 // indirect
277+
k8s.io/cli-runtime v0.36.2 // indirect
278+
k8s.io/component-helpers v0.36.2 // indirect
276279
k8s.io/kube-openapi v0.0.0-20260330154417-16be699c7b31 // indirect
277-
k8s.io/kubectl v0.35.3 // indirect
278-
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5 // indirect
280+
k8s.io/kubectl v0.36.2 // indirect
281+
k8s.io/streaming v0.36.2 // indirect
282+
k8s.io/utils v0.0.0-20260507154919-ff6756f316d2 // indirect
279283
sigs.k8s.io/cli-utils v0.37.3-0.20250918194211-77c836a69463 // indirect
280-
sigs.k8s.io/controller-runtime v0.23.3 // indirect
284+
sigs.k8s.io/controller-runtime v0.24.1 // indirect
281285
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
282286
sigs.k8s.io/kustomize/api v0.21.1 // indirect
283287
sigs.k8s.io/kustomize/kyaml v0.21.1 // indirect

0 commit comments

Comments
 (0)