Skip to content

Commit 3cf939a

Browse files
committed
ci: resolve helm upgrade to v4
1 parent 1f83c08 commit 3cf939a

4 files changed

Lines changed: 26 additions & 14 deletions

File tree

go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
dario.cat/mergo v1.0.2 // indirect
1616
github.com/Masterminds/semver/v3 v3.4.0 // indirect
1717
github.com/Microsoft/go-winio v0.6.2 // indirect
18-
github.com/ProtonMail/go-crypto v1.2.0 // indirect
18+
github.com/ProtonMail/go-crypto v1.3.0 // indirect
1919
github.com/cloudflare/circl v1.6.1 // indirect
2020
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
2121
github.com/cyphar/filepath-securejoin v0.6.0 // indirect
@@ -60,10 +60,10 @@ require (
6060
gopkg.in/inf.v0 v0.9.1 // indirect
6161
gopkg.in/warnings.v0 v0.1.2 // indirect
6262
gotest.tools/v3 v3.4.0 // indirect
63-
k8s.io/api v0.34.0 // indirect
64-
k8s.io/apiextensions-apiserver v0.34.0 // indirect
65-
k8s.io/apimachinery v0.34.0 // indirect
66-
k8s.io/client-go v0.34.0 // indirect
63+
k8s.io/api v0.34.1 // indirect
64+
k8s.io/apiextensions-apiserver v0.34.1 // indirect
65+
k8s.io/apimachinery v0.34.1 // indirect
66+
k8s.io/client-go v0.34.1 // indirect
6767
k8s.io/klog/v2 v2.130.1 // indirect
6868
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
6969
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect

go.sum

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo
99
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
1010
github.com/ProtonMail/go-crypto v1.2.0 h1:+PhXXn4SPGd+qk76TlEePBfOfivE0zkWFenhGhFLzWs=
1111
github.com/ProtonMail/go-crypto v1.2.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
12+
github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=
13+
github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
1214
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
1315
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
1416
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
@@ -216,14 +218,24 @@ gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
216218
gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
217219
helm.sh/helm/v3 v3.19.1 h1:QVMzHbanyurO8oynx0drDOfG02XxSvrHqaFrf9yrMf0=
218220
helm.sh/helm/v3 v3.19.1/go.mod h1:gX10tB5ErM+8fr7bglUUS/UfTOO8UUTYWIBH1IYNnpE=
221+
helm.sh/helm/v4 v4.0.0 h1:Ppai7cygdmyxSR+JR9djUoVrRmyMI/yY5P5TBd25oHs=
222+
helm.sh/helm/v4 v4.0.0/go.mod h1:G1Y5AE+lJPQSAjh7nbXnhZrtGtxo+I6POSu9DruYiGI=
219223
k8s.io/api v0.34.0 h1:L+JtP2wDbEYPUeNGbeSa/5GwFtIA662EmT2YSLOkAVE=
220224
k8s.io/api v0.34.0/go.mod h1:YzgkIzOOlhl9uwWCZNqpw6RJy9L2FK4dlJeayUoydug=
225+
k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM=
226+
k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk=
221227
k8s.io/apiextensions-apiserver v0.34.0 h1:B3hiB32jV7BcyKcMU5fDaDxk882YrJ1KU+ZSkA9Qxoc=
222228
k8s.io/apiextensions-apiserver v0.34.0/go.mod h1:hLI4GxE1BDBy9adJKxUxCEHBGZtGfIg98Q+JmTD7+g0=
229+
k8s.io/apiextensions-apiserver v0.34.1 h1:NNPBva8FNAPt1iSVwIE0FsdrVriRXMsaWFMqJbII2CI=
230+
k8s.io/apiextensions-apiserver v0.34.1/go.mod h1:hP9Rld3zF5Ay2Of3BeEpLAToP+l4s5UlxiHfqRaRcMc=
223231
k8s.io/apimachinery v0.34.0 h1:eR1WO5fo0HyoQZt1wdISpFDffnWOvFLOOeJ7MgIv4z0=
224232
k8s.io/apimachinery v0.34.0/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
233+
k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
234+
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
225235
k8s.io/client-go v0.34.0 h1:YoWv5r7bsBfb0Hs2jh8SOvFbKzzxyNo0nSb0zC19KZo=
226236
k8s.io/client-go v0.34.0/go.mod h1:ozgMnEKXkRjeMvBZdV1AijMHLTh3pbACPvK7zFR+QQY=
237+
k8s.io/client-go v0.34.1 h1:ZUPJKgXsnKwVwmKKdPfw4tB58+7/Ik3CrjOEhsiZ7mY=
238+
k8s.io/client-go v0.34.1/go.mod h1:kA8v0FP+tk6sZA0yKLRG67LWjqufAoSHA2xVGKw9Of8=
227239
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
228240
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
229241
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=

internal/chart/find.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"strings"
1313

1414
"gopkg.in/yaml.v3"
15-
"helm.sh/helm/v3/pkg/chart"
16-
"helm.sh/helm/v3/pkg/chartutil"
15+
chart "helm.sh/helm/v4/pkg/chart/v2"
16+
"helm.sh/helm/v4/pkg/chart/v2/util"
1717
)
1818

1919
var (
@@ -51,7 +51,7 @@ func Save(chart *Chart) error {
5151
return nil
5252
}
5353

54-
return chartutil.SaveChartfile(
54+
return util.SaveChartfile(
5555
chart.Path,
5656
chart.Meta,
5757
)
@@ -67,7 +67,7 @@ func Find(root string) ([]*Chart, error) {
6767
charts := make([]*Chart, 0, len(files))
6868

6969
for _, file := range files {
70-
chart, err := chartutil.LoadChartfile(file)
70+
chart, err := util.LoadChartfile(file)
7171

7272
if err != nil {
7373
return nil, err

internal/chart/update.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
"github.com/hashicorp/go-version"
1111
"github.com/rs/zerolog/log"
12-
"helm.sh/helm/v3/pkg/chart"
13-
"helm.sh/helm/v3/pkg/chartutil"
12+
chart "helm.sh/helm/v4/pkg/chart/v2"
13+
"helm.sh/helm/v4/pkg/chart/v2/util"
1414
)
1515

1616
type Bump int
@@ -52,7 +52,7 @@ func UpdateApp(c *Chart, latest string) error {
5252
return nil
5353
}
5454

55-
if err := chartutil.SaveChartfile(
55+
if err := util.SaveChartfile(
5656
c.Path,
5757
c.Meta,
5858
); err != nil {
@@ -210,7 +210,7 @@ func UpdateDependency(c *Chart, d *chart.Dependency, latest string) error {
210210
return nil
211211
}
212212

213-
if err := chartutil.SaveChartfile(
213+
if err := util.SaveChartfile(
214214
c.Path,
215215
c.Meta,
216216
); err != nil {
@@ -324,7 +324,7 @@ func UpdateVersion(c *Chart) error {
324324
segments[2],
325325
)
326326

327-
return chartutil.SaveChartfile(
327+
return util.SaveChartfile(
328328
c.Path,
329329
c.Meta,
330330
)

0 commit comments

Comments
 (0)