Skip to content

Commit 7d06869

Browse files
ycombinatorclaude
ycombinator
and
claude
committed
fix: migrate helm v3 to v4 imports and API changes
Update all code that imports helm.sh/helm/v3 to helm.sh/helm/v4, adapting to the breaking API changes in v4: - chartutil.KubeVersion → chart/common.KubeVersion - repo.* → repo/v1.* - action.Configuration.Init() drops the log function parameter - Install.DryRun + ClientOnly → Install.DryRunStrategy = DryRunClient - Install/Uninstall/Upgrade.Wait → WaitStrategy = LegacyStrategy - Install.Run() returns ri.Releaser (any); use ri.NewAccessor() to get Manifest() - kube.NewReadyChecker() drops the log function parameter Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 17b1ebc commit 7d06869

11 files changed

Lines changed: 288 additions & 198 deletions

File tree

‎NOTICE-fips.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8362,11 +8362,11 @@ Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.82.1/LIC
83628362

83638363
--------------------------------------------------------------------------------
83648364
Dependency : google.golang.org/protobuf
8365-
Version: v1.36.11
8365+
Version: v1.36.12-0.20260120151049-f2248ac996af
83668366
Licence type (autodetected): BSD-3-Clause
83678367
--------------------------------------------------------------------------------
83688368

8369-
Contents of probable licence file $GOMODCACHE/google.golang.org/protobuf@v1.36.11/LICENSE:
8369+
Contents of probable licence file $GOMODCACHE/google.golang.org/protobuf@v1.36.12-0.20260120151049-f2248ac996af/LICENSE:
83708370

83718371
Copyright (c) 2018 The Go Authors. All rights reserved.
83728372

@@ -8939,11 +8939,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
89398939

89408940
--------------------------------------------------------------------------------
89418941
Dependency : k8s.io/api
8942-
Version: v0.35.3
8942+
Version: v0.36.2
89438943
Licence type (autodetected): Apache-2.0
89448944
--------------------------------------------------------------------------------
89458945

8946-
Contents of probable licence file $GOMODCACHE/k8s.io/api@v0.35.3/LICENSE:
8946+
Contents of probable licence file $GOMODCACHE/k8s.io/api@v0.36.2/LICENSE:
89478947

89488948

89498949
Apache License
@@ -9151,11 +9151,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/api@v0.35.3/LICENSE:
91519151

91529152
--------------------------------------------------------------------------------
91539153
Dependency : k8s.io/apimachinery
9154-
Version: v0.35.3
9154+
Version: v0.36.2
91559155
Licence type (autodetected): Apache-2.0
91569156
--------------------------------------------------------------------------------
91579157

9158-
Contents of probable licence file $GOMODCACHE/k8s.io/apimachinery@v0.35.3/LICENSE:
9158+
Contents of probable licence file $GOMODCACHE/k8s.io/apimachinery@v0.36.2/LICENSE:
91599159

91609160

91619161
Apache License
@@ -9363,11 +9363,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/apimachinery@v0.35.3/LICENS
93639363

93649364
--------------------------------------------------------------------------------
93659365
Dependency : k8s.io/client-go
9366-
Version: v0.35.3
9366+
Version: v0.36.2
93679367
Licence type (autodetected): Apache-2.0
93689368
--------------------------------------------------------------------------------
93699369

9370-
Contents of probable licence file $GOMODCACHE/k8s.io/client-go@v0.35.3/LICENSE:
9370+
Contents of probable licence file $GOMODCACHE/k8s.io/client-go@v0.36.2/LICENSE:
93719371

93729372

93739373
Apache License
@@ -55515,11 +55515,11 @@ third-party archives.
5551555515

5551655516
--------------------------------------------------------------------------------
5551755517
Dependency : k8s.io/kube-openapi
55518-
Version: v0.0.0-20250910181357-589584f1c912
55518+
Version: v0.0.0-20260317180543-43fb72c5454a
5551955519
Licence type (autodetected): Apache-2.0
5552055520
--------------------------------------------------------------------------------
5552155521

55522-
Contents of probable licence file $GOMODCACHE/k8s.io/kube-openapi@v0.0.0-20250910181357-589584f1c912/LICENSE:
55522+
Contents of probable licence file $GOMODCACHE/k8s.io/kube-openapi@v0.0.0-20260317180543-43fb72c5454a/LICENSE:
5552355523

5552455524

5552555525
Apache License
@@ -55727,11 +55727,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/kube-openapi@v0.0.0-2025091
5572755727

5572855728
--------------------------------------------------------------------------------
5572955729
Dependency : k8s.io/utils
55730-
Version: v0.0.0-20251002143259-bc988d571ff4
55730+
Version: v0.0.0-20260210185600-b8788abfbbc2
5573155731
Licence type (autodetected): Apache-2.0
5573255732
--------------------------------------------------------------------------------
5573355733

55734-
Contents of probable licence file $GOMODCACHE/k8s.io/utils@v0.0.0-20251002143259-bc988d571ff4/LICENSE:
55734+
Contents of probable licence file $GOMODCACHE/k8s.io/utils@v0.0.0-20260210185600-b8788abfbbc2/LICENSE:
5573555735

5573655736

5573755737
Apache License
@@ -56807,11 +56807,11 @@ Contents of probable licence file $GOMODCACHE/sigs.k8s.io/randfill@v1.0.0/LICENS
5680756807

5680856808
--------------------------------------------------------------------------------
5680956809
Dependency : sigs.k8s.io/structured-merge-diff/v6
56810-
Version: v6.3.2-0.20260122202528-d9cc6641c482
56810+
Version: v6.3.2
5681156811
Licence type (autodetected): Apache-2.0
5681256812
--------------------------------------------------------------------------------
5681356813

56814-
Contents of probable licence file $GOMODCACHE/sigs.k8s.io/structured-merge-diff/v6@v6.3.2-0.20260122202528-d9cc6641c482/LICENSE:
56814+
Contents of probable licence file $GOMODCACHE/sigs.k8s.io/structured-merge-diff/v6@v6.3.2/LICENSE:
5681556815

5681656816
Apache License
5681756817
Version 2.0, January 2004
@@ -112413,11 +112413,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/kubelet@v0.35.4/LICENSE:
112413112413

112414112414
--------------------------------------------------------------------------------
112415112415
Dependency : sigs.k8s.io/controller-runtime
112416-
Version: v0.23.3
112416+
Version: v0.24.1
112417112417
Licence type (autodetected): Apache-2.0
112418112418
--------------------------------------------------------------------------------
112419112419

112420-
Contents of probable licence file $GOMODCACHE/sigs.k8s.io/controller-runtime@v0.23.3/LICENSE:
112420+
Contents of probable licence file $GOMODCACHE/sigs.k8s.io/controller-runtime@v0.24.1/LICENSE:
112421112421

112422112422
Apache License
112423112423
Version 2.0, January 2004

‎NOTICE.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8362,11 +8362,11 @@ Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.82.1/LIC
83628362

83638363
--------------------------------------------------------------------------------
83648364
Dependency : google.golang.org/protobuf
8365-
Version: v1.36.11
8365+
Version: v1.36.12-0.20260120151049-f2248ac996af
83668366
Licence type (autodetected): BSD-3-Clause
83678367
--------------------------------------------------------------------------------
83688368

8369-
Contents of probable licence file $GOMODCACHE/google.golang.org/protobuf@v1.36.11/LICENSE:
8369+
Contents of probable licence file $GOMODCACHE/google.golang.org/protobuf@v1.36.12-0.20260120151049-f2248ac996af/LICENSE:
83708370

83718371
Copyright (c) 2018 The Go Authors. All rights reserved.
83728372

@@ -8939,11 +8939,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
89398939

89408940
--------------------------------------------------------------------------------
89418941
Dependency : k8s.io/api
8942-
Version: v0.35.3
8942+
Version: v0.36.2
89438943
Licence type (autodetected): Apache-2.0
89448944
--------------------------------------------------------------------------------
89458945

8946-
Contents of probable licence file $GOMODCACHE/k8s.io/api@v0.35.3/LICENSE:
8946+
Contents of probable licence file $GOMODCACHE/k8s.io/api@v0.36.2/LICENSE:
89478947

89488948

89498949
Apache License
@@ -9151,11 +9151,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/api@v0.35.3/LICENSE:
91519151

91529152
--------------------------------------------------------------------------------
91539153
Dependency : k8s.io/apimachinery
9154-
Version: v0.35.3
9154+
Version: v0.36.2
91559155
Licence type (autodetected): Apache-2.0
91569156
--------------------------------------------------------------------------------
91579157

9158-
Contents of probable licence file $GOMODCACHE/k8s.io/apimachinery@v0.35.3/LICENSE:
9158+
Contents of probable licence file $GOMODCACHE/k8s.io/apimachinery@v0.36.2/LICENSE:
91599159

91609160

91619161
Apache License
@@ -9363,11 +9363,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/apimachinery@v0.35.3/LICENS
93639363

93649364
--------------------------------------------------------------------------------
93659365
Dependency : k8s.io/client-go
9366-
Version: v0.35.3
9366+
Version: v0.36.2
93679367
Licence type (autodetected): Apache-2.0
93689368
--------------------------------------------------------------------------------
93699369

9370-
Contents of probable licence file $GOMODCACHE/k8s.io/client-go@v0.35.3/LICENSE:
9370+
Contents of probable licence file $GOMODCACHE/k8s.io/client-go@v0.36.2/LICENSE:
93719371

93729372

93739373
Apache License
@@ -56337,11 +56337,11 @@ third-party archives.
5633756337

5633856338
--------------------------------------------------------------------------------
5633956339
Dependency : k8s.io/kube-openapi
56340-
Version: v0.0.0-20250910181357-589584f1c912
56340+
Version: v0.0.0-20260317180543-43fb72c5454a
5634156341
Licence type (autodetected): Apache-2.0
5634256342
--------------------------------------------------------------------------------
5634356343

56344-
Contents of probable licence file $GOMODCACHE/k8s.io/kube-openapi@v0.0.0-20250910181357-589584f1c912/LICENSE:
56344+
Contents of probable licence file $GOMODCACHE/k8s.io/kube-openapi@v0.0.0-20260317180543-43fb72c5454a/LICENSE:
5634556345

5634656346

5634756347
Apache License
@@ -56549,11 +56549,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/kube-openapi@v0.0.0-2025091
5654956549

5655056550
--------------------------------------------------------------------------------
5655156551
Dependency : k8s.io/utils
56552-
Version: v0.0.0-20251002143259-bc988d571ff4
56552+
Version: v0.0.0-20260210185600-b8788abfbbc2
5655356553
Licence type (autodetected): Apache-2.0
5655456554
--------------------------------------------------------------------------------
5655556555

56556-
Contents of probable licence file $GOMODCACHE/k8s.io/utils@v0.0.0-20251002143259-bc988d571ff4/LICENSE:
56556+
Contents of probable licence file $GOMODCACHE/k8s.io/utils@v0.0.0-20260210185600-b8788abfbbc2/LICENSE:
5655756557

5655856558

5655956559
Apache License
@@ -57629,11 +57629,11 @@ Contents of probable licence file $GOMODCACHE/sigs.k8s.io/randfill@v1.0.0/LICENS
5762957629

5763057630
--------------------------------------------------------------------------------
5763157631
Dependency : sigs.k8s.io/structured-merge-diff/v6
57632-
Version: v6.3.2-0.20260122202528-d9cc6641c482
57632+
Version: v6.3.2
5763357633
Licence type (autodetected): Apache-2.0
5763457634
--------------------------------------------------------------------------------
5763557635

57636-
Contents of probable licence file $GOMODCACHE/sigs.k8s.io/structured-merge-diff/v6@v6.3.2-0.20260122202528-d9cc6641c482/LICENSE:
57636+
Contents of probable licence file $GOMODCACHE/sigs.k8s.io/structured-merge-diff/v6@v6.3.2/LICENSE:
5763757637

5763857638
Apache License
5763957639
Version 2.0, January 2004
@@ -119428,11 +119428,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/kubelet@v0.35.4/LICENSE:
119428119428

119429119429
--------------------------------------------------------------------------------
119430119430
Dependency : sigs.k8s.io/controller-runtime
119431-
Version: v0.23.3
119431+
Version: v0.24.1
119432119432
Licence type (autodetected): Apache-2.0
119433119433
--------------------------------------------------------------------------------
119434119434

119435-
Contents of probable licence file $GOMODCACHE/sigs.k8s.io/controller-runtime@v0.23.3/LICENSE:
119435+
Contents of probable licence file $GOMODCACHE/sigs.k8s.io/controller-runtime@v0.24.1/LICENSE:
119436119436

119437119437
Apache License
119438119438
Version 2.0, January 2004

‎go.mod‎

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -82,20 +82,20 @@ require (
8282
golang.org/x/time v0.15.0
8383
google.golang.org/api v0.289.0
8484
google.golang.org/grpc v1.82.1
85-
google.golang.org/protobuf v1.36.11
85+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af
8686
gopkg.in/ini.v1 v1.67.3
8787
gopkg.in/yaml.v2 v2.4.0
8888
gopkg.in/yaml.v3 v3.0.1
8989
helm.sh/helm/v4 v4.2.4
9090
howett.net/plist v1.0.2-0.20250314012144-ee69052608d9
91-
k8s.io/api v0.35.3
92-
k8s.io/apimachinery v0.35.3
93-
k8s.io/cli-runtime v0.35.2
94-
k8s.io/client-go v0.35.3
91+
k8s.io/api v0.36.2
92+
k8s.io/apimachinery v0.36.2
93+
k8s.io/cli-runtime v0.36.2
94+
k8s.io/client-go v0.36.2
9595
kernel.org/pub/linux/libs/security/libcap/cap v1.2.78
9696
sigs.k8s.io/e2e-framework v0.7.0
97-
sigs.k8s.io/kustomize/api v0.20.1
98-
sigs.k8s.io/kustomize/kyaml v0.20.1
97+
sigs.k8s.io/kustomize/api v0.21.1
98+
sigs.k8s.io/kustomize/kyaml v0.21.1
9999
)
100100

101101
require (
@@ -120,9 +120,10 @@ require (
120120
github.com/BurntSushi/toml v1.6.0 // indirect
121121
github.com/MakeNowJust/heredoc v1.0.0 // indirect
122122
github.com/Masterminds/goutils v1.1.1 // indirect
123-
github.com/Masterminds/semver/v3 v3.4.0 // indirect
123+
github.com/Masterminds/semver/v3 v3.5.0 // indirect
124124
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
125125
github.com/Masterminds/squirrel v1.5.4 // indirect
126+
github.com/ProtonMail/go-crypto v1.4.1 // indirect
126127
github.com/akavel/rsrc v0.10.2 // indirect
127128
github.com/apache/thrift v0.24.0 // indirect
128129
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
@@ -136,19 +137,19 @@ require (
136137
github.com/chai2010/gettext-go v1.0.2 // indirect
137138
github.com/cilium/ebpf v0.22.0 // indirect
138139
github.com/clipperhouse/uax29/v2 v2.2.0 // indirect
139-
github.com/containerd/containerd v1.7.30 // indirect
140+
github.com/cloudflare/circl v1.6.3 // indirect
140141
github.com/containerd/errdefs v1.0.0 // indirect
141142
github.com/containerd/errdefs/pkg v0.3.0 // indirect
142143
github.com/containerd/log v0.1.0 // indirect
143144
github.com/containerd/platforms v1.0.0-rc.4 // indirect
144145
github.com/cpuguy83/dockercfg v0.3.2 // indirect
145146
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
146-
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
147+
github.com/cyphar/filepath-securejoin v0.7.0 // indirect
147148
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
148149
github.com/dnephin/pflag v1.0.7 // indirect
149-
github.com/docker/docker-credential-helpers v0.9.5 // indirect
150150
github.com/docker/go-connections v0.7.0 // indirect
151151
github.com/dustin/go-humanize v1.0.1 // indirect
152+
github.com/dylibso/observe-sdk/go v0.0.0-20240819160327-2d926c5d788a // indirect
152153
github.com/eapache/go-resiliency v1.7.0 // indirect
153154
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
154155
github.com/eapache/queue v1.1.0 // indirect
@@ -166,11 +167,13 @@ require (
166167
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
167168
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
168169
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
170+
github.com/extism/go-sdk v1.7.1 // indirect
169171
github.com/fatih/structs v1.1.0 // indirect
170172
github.com/felixge/httpsnoop v1.1.0 // indirect
173+
github.com/fluxcd/cli-utils v1.2.1 // indirect
171174
github.com/foxboron/go-tpm-keyfiles v0.0.0-20251226215517-609e4778396f // indirect
172175
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
173-
github.com/go-errors/errors v1.4.2 // indirect
176+
github.com/go-errors/errors v1.5.1 // indirect
174177
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
175178
github.com/go-logr/logr v1.4.3 // indirect
176179
github.com/go-logr/stdr v1.2.2 // indirect
@@ -203,13 +206,14 @@ require (
203206
github.com/googleapis/gax-go/v2 v2.23.0 // indirect
204207
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
205208
github.com/gosuri/uitable v0.0.4 // indirect
206-
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
209+
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
207210
github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect
208211
github.com/hashicorp/errwrap v1.1.0 // indirect
209212
github.com/hashicorp/go-multierror v1.1.1 // indirect
210213
github.com/hashicorp/go-uuid v1.0.3 // indirect
211214
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
212215
github.com/huandu/xstrings v1.5.0 // indirect
216+
github.com/ianlancetaylor/demangle v0.0.0-20250417193237-f615e6bd150b // indirect
213217
github.com/inconshreveable/mousetrap v1.1.0 // indirect
214218
github.com/jaypipes/pcidb v1.1.1 // indirect
215219
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
@@ -256,7 +260,6 @@ require (
256260
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
257261
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
258262
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
259-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
260263
github.com/oapi-codegen/runtime v1.4.0 // indirect
261264
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.157.0 // indirect
262265
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.157.0 // indirect
@@ -287,6 +290,8 @@ require (
287290
github.com/sirupsen/logrus v1.9.4 // indirect
288291
github.com/spf13/cast v1.10.0 // indirect
289292
github.com/stretchr/objx v0.5.3 // indirect
293+
github.com/tetratelabs/wabin v0.0.0-20230304001439-f6f874872834 // indirect
294+
github.com/tetratelabs/wazero v1.12.0 // indirect
290295
github.com/tklauser/go-sysconf v0.4.0 // indirect
291296
github.com/tklauser/numcpus v0.12.0 // indirect
292297
github.com/urfave/cli/v2 v2.27.7 // indirect
@@ -378,18 +383,19 @@ require (
378383
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
379384
gopkg.in/inf.v0 v0.9.1 // indirect
380385
gotest.tools/gotestsum v1.13.0 // indirect
381-
k8s.io/apiextensions-apiserver v0.35.1 // indirect
382-
k8s.io/apiserver v0.35.1 // indirect
383-
k8s.io/component-base v0.35.3 // indirect
384-
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
385-
k8s.io/kubectl v0.35.1 // indirect
386-
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
386+
k8s.io/apiextensions-apiserver v0.36.2 // indirect
387+
k8s.io/apiserver v0.36.2 // indirect
388+
k8s.io/component-base v0.36.2 // indirect
389+
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect
390+
k8s.io/kubectl v0.36.2 // indirect
391+
k8s.io/streaming v0.36.2 // indirect
392+
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect
387393
kernel.org/pub/linux/libs/security/libcap/psx v1.2.78 // indirect
388-
oras.land/oras-go/v2 v2.6.0 // indirect
389-
sigs.k8s.io/controller-runtime v0.23.3 // indirect
394+
oras.land/oras-go/v2 v2.6.1 // indirect
395+
sigs.k8s.io/controller-runtime v0.24.1 // indirect
390396
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
391397
sigs.k8s.io/randfill v1.0.0 // indirect
392-
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 // indirect
398+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
393399
sigs.k8s.io/yaml v1.6.0 // indirect
394400
)
395401

0 commit comments

Comments
 (0)