Skip to content

Commit a4f1c1d

Browse files
Angel-4903Angel Raphael
Angel-4903
and
Angel Raphael
authored
Fix SECVULN-42899: Upgrade Helm and Kubernetes dependencies (#1807)
* Fix SECVULN-42899: Upgrade Helm and Kubernetes dependencies - Upgrade helm.sh/helm/v3 from v3.18.5 to v3.20.2 - Upgrade Kubernetes dependencies from v0.33.3 to v0.35.1 - Update structured-merge-diff from v4 to v6 for compatibility - Update test fixture to match new Kubernetes API serialization format * Update changelog entry with PR number * Fix OCI registry tests for Helm 3.20.2 Add --plain-http flag to helm push and helm registry login commands to support HTTP-only test registry with upgraded Helm version. --------- Co-authored-by: Angel Raphael <angelraphael@dhcp-9-81-81-135.n3d-in.ibm.com>
1 parent 61d3803 commit a4f1c1d

6 files changed

Lines changed: 134 additions & 168 deletions

File tree

‎.changelog/1807.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:note
2+
Upgrade Helm from 3.18.5 to 3.20.2
3+
```

‎go.mod‎

Lines changed: 32 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ require (
1313
github.com/hashicorp/terraform-plugin-testing v1.13.0
1414
github.com/mitchellh/go-homedir v1.1.0
1515
github.com/pkg/errors v0.9.1
16-
github.com/stretchr/testify v1.10.0
17-
helm.sh/helm/v3 v3.18.5
18-
k8s.io/api v0.33.3
19-
k8s.io/apimachinery v0.33.3
20-
k8s.io/cli-runtime v0.33.3
21-
k8s.io/client-go v0.33.3
16+
github.com/stretchr/testify v1.11.1
17+
helm.sh/helm/v3 v3.20.2
18+
k8s.io/api v0.35.1
19+
k8s.io/apimachinery v0.35.1
20+
k8s.io/cli-runtime v0.35.1
21+
k8s.io/client-go v0.35.1
2222
k8s.io/helm v2.17.0+incompatible
2323
k8s.io/klog v1.0.0
24-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
25-
k8s.io/kubectl v0.33.3
26-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0
27-
sigs.k8s.io/yaml v1.5.0
24+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
25+
k8s.io/kubectl v0.35.1
26+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0
27+
sigs.k8s.io/yaml v1.6.0
2828
)
2929

3030
require (
@@ -37,10 +37,10 @@ require (
3737
require (
3838
dario.cat/mergo v1.0.1 // indirect
3939
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
40-
github.com/BurntSushi/toml v1.5.0 // indirect
40+
github.com/BurntSushi/toml v1.6.0 // indirect
4141
github.com/MakeNowJust/heredoc v1.0.0 // indirect
4242
github.com/Masterminds/goutils v1.1.1 // indirect
43-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
43+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
4444
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
4545
github.com/Masterminds/squirrel v1.5.4 // indirect
4646
github.com/ProtonMail/go-crypto v1.4.1 // indirect
@@ -52,18 +52,18 @@ require (
5252
github.com/blang/semver/v4 v4.0.0 // indirect
5353
github.com/chai2010/gettext-go v1.0.2 // indirect
5454
github.com/cloudflare/circl v1.6.3 // indirect
55-
github.com/containerd/containerd v1.7.29 // indirect
55+
github.com/containerd/containerd v1.7.30 // indirect
5656
github.com/containerd/errdefs v0.3.0 // indirect
5757
github.com/containerd/log v0.1.0 // indirect
5858
github.com/containerd/platforms v0.2.1 // indirect
59-
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
59+
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
6060
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
61-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
61+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
6262
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
6363
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
6464
github.com/fatih/camelcase v1.0.0 // indirect
6565
github.com/fatih/color v1.16.0 // indirect
66-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
66+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
6767
github.com/ghodss/yaml v1.0.0 // indirect
6868
github.com/go-errors/errors v1.4.2 // indirect
6969
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
@@ -72,14 +72,11 @@ require (
7272
github.com/go-openapi/jsonreference v0.20.2 // indirect
7373
github.com/go-openapi/swag v0.23.0 // indirect
7474
github.com/gobwas/glob v0.2.3 // indirect
75-
github.com/gogo/protobuf v1.3.2 // indirect
7675
github.com/golang/protobuf v1.5.4 // indirect
7776
github.com/google/btree v1.1.3 // indirect
78-
github.com/google/gnostic-models v0.6.9 // indirect
77+
github.com/google/gnostic-models v0.7.0 // indirect
7978
github.com/google/go-cmp v0.7.0 // indirect
80-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
8179
github.com/google/uuid v1.6.0 // indirect
82-
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
8380
github.com/gosuri/uitable v0.0.4 // indirect
8481
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
8582
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -120,27 +117,25 @@ require (
120117
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
121118
github.com/mitchellh/mapstructure v1.5.0 // indirect
122119
github.com/mitchellh/reflectwalk v1.0.2 // indirect
123-
github.com/moby/spdystream v0.5.0 // indirect
124120
github.com/moby/term v0.5.2 // indirect
125121
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
126-
github.com/modern-go/reflect2 v1.0.2 // indirect
122+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
127123
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
128124
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
129-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
130125
github.com/oklog/run v1.1.0 // indirect
131126
github.com/opencontainers/go-digest v1.0.0 // indirect
132127
github.com/opencontainers/image-spec v1.1.1 // indirect
133128
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
134129
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
135130
github.com/posener/complete v1.2.3 // indirect
136-
github.com/rubenv/sql-migrate v1.8.0 // indirect
131+
github.com/rubenv/sql-migrate v1.8.1 // indirect
137132
github.com/russross/blackfriday/v2 v2.1.0 // indirect
138133
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
139134
github.com/shopspring/decimal v1.4.0 // indirect
140135
github.com/sirupsen/logrus v1.9.3 // indirect
141136
github.com/spf13/cast v1.7.0 // indirect
142-
github.com/spf13/cobra v1.9.1 // indirect
143-
github.com/spf13/pflag v1.0.7 // indirect
137+
github.com/spf13/cobra v1.10.2 // indirect
138+
github.com/spf13/pflag v1.0.10 // indirect
144139
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
145140
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
146141
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
@@ -150,8 +145,8 @@ require (
150145
github.com/yuin/goldmark-meta v1.1.0 // indirect
151146
github.com/zclconf/go-cty v1.16.2 // indirect
152147
go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect
153-
go.yaml.in/yaml/v2 v2.4.2 // indirect
154-
go.yaml.in/yaml/v3 v3.0.3 // indirect
148+
go.yaml.in/yaml/v2 v2.4.3 // indirect
149+
go.yaml.in/yaml/v3 v3.0.4 // indirect
155150
golang.org/x/crypto v0.49.0 // indirect
156151
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
157152
golang.org/x/mod v0.35.0 // indirect
@@ -167,19 +162,19 @@ require (
167162
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
168163
google.golang.org/grpc v1.79.3 // indirect
169164
google.golang.org/protobuf v1.36.10 // indirect
170-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
165+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
171166
gopkg.in/inf.v0 v0.9.1 // indirect
172167
gopkg.in/yaml.v2 v2.4.0 // indirect
173168
gopkg.in/yaml.v3 v3.0.1 // indirect
174-
k8s.io/apiextensions-apiserver v0.33.3 // indirect
175-
k8s.io/apiserver v0.33.3 // indirect
176-
k8s.io/component-base v0.33.3 // indirect
177-
k8s.io/component-helpers v0.33.3 // indirect
169+
k8s.io/apiextensions-apiserver v0.35.1 // indirect
170+
k8s.io/apiserver v0.35.1 // indirect
171+
k8s.io/component-base v0.35.1 // indirect
172+
k8s.io/component-helpers v0.35.1 // indirect
178173
k8s.io/klog/v2 v2.130.1 // indirect
179-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
174+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
180175
oras.land/oras-go/v2 v2.6.0 // indirect
181-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
182-
sigs.k8s.io/kustomize/api v0.19.0 // indirect
183-
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
176+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
177+
sigs.k8s.io/kustomize/api v0.20.1 // indirect
178+
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
184179
sigs.k8s.io/randfill v1.0.0 // indirect
185180
)

0 commit comments

Comments
 (0)