Skip to content

Commit 008e0db

Browse files
matheuscscpmatheuscscp
authored
Merge pull request #1953 from fluxcd/helm4
Upgrade Helm to `v4.0.4`
2 parents eae8f25 + e7b511d commit 008e0db

Some content is hidden

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

41 files changed

+500
-702
lines changed

‎api/v1/helmrepository_types.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ import (
2828
const (
2929
// HelmRepositoryKind is the string representation of a HelmRepository.
3030
HelmRepositoryKind = "HelmRepository"
31-
// HelmRepositoryURLIndexKey is the key used for indexing HelmRepository
32-
// objects by their HelmRepositorySpec.URL.
33-
HelmRepositoryURLIndexKey = ".metadata.helmRepositoryURL"
3431
// HelmRepositoryTypeDefault is the default HelmRepository type.
3532
// It is used when no type is specified and corresponds to a Helm repository.
3633
HelmRepositoryTypeDefault = "default"

‎api/v1/source.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@ import (
2424
"github.com/fluxcd/pkg/apis/meta"
2525
)
2626

27-
const (
28-
// SourceIndexKey is the key used for indexing objects based on their
29-
// referenced Source.
30-
SourceIndexKey string = ".metadata.source"
31-
)
32-
3327
// Source interface must be supported by all API types.
3428
// Source is the interface that provides generic access to the Artifact and
3529
// interval. It must be supported by all kinds of the source.toolkit.fluxcd.io

‎go.mod‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1
1717
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.3
1818
github.com/Masterminds/semver/v3 v3.4.0
19-
github.com/cyphar/filepath-securejoin v0.6.0
19+
github.com/cyphar/filepath-securejoin v0.6.1
2020
github.com/distribution/distribution/v3 v3.0.0
2121
github.com/docker/cli v28.5.0+incompatible
2222
github.com/docker/go-units v0.5.0
@@ -27,10 +27,9 @@ require (
2727
github.com/fluxcd/pkg/artifact v0.5.0
2828
github.com/fluxcd/pkg/auth v0.33.0
2929
github.com/fluxcd/pkg/cache v0.12.0
30-
github.com/fluxcd/pkg/git v0.38.0
31-
github.com/fluxcd/pkg/git/gogit v0.42.0
32-
github.com/fluxcd/pkg/gittestserver v0.22.0
33-
github.com/fluxcd/pkg/helmtestserver v0.33.0
30+
github.com/fluxcd/pkg/git v0.39.0
31+
github.com/fluxcd/pkg/gittestserver v0.23.0
32+
github.com/fluxcd/pkg/helmtestserver v0.34.0
3433
github.com/fluxcd/pkg/http/transport v0.7.0
3534
github.com/fluxcd/pkg/masktoken v0.8.0
3635
github.com/fluxcd/pkg/oci v0.58.0
@@ -42,16 +41,16 @@ require (
4241
github.com/fluxcd/pkg/version v0.11.0
4342
github.com/fluxcd/source-controller/api v1.7.0
4443
github.com/foxcpp/go-mockdns v1.1.0
45-
github.com/go-git/go-billy/v5 v5.6.2
46-
github.com/go-git/go-git/v5 v5.16.3
44+
github.com/go-git/go-billy/v5 v5.7.0
45+
github.com/go-git/go-git/v5 v5.16.4
4746
github.com/go-logr/logr v1.4.3
4847
github.com/google/go-containerregistry v0.20.6
4948
github.com/google/go-containerregistry/pkg/authn/k8schain v0.0.0-20250613215107-59a4b8593039
5049
github.com/google/uuid v1.6.0
5150
github.com/minio/minio-go/v7 v7.0.95
5251
github.com/notaryproject/notation-core-go v1.3.0
5352
github.com/notaryproject/notation-go v1.3.2
54-
github.com/onsi/gomega v1.38.2
53+
github.com/onsi/gomega v1.38.3
5554
github.com/opencontainers/go-digest v1.0.0
5655
github.com/opencontainers/image-spec v1.1.1
5756
github.com/ory/dockertest/v3 v3.12.0
@@ -62,11 +61,11 @@ require (
6261
github.com/sigstore/sigstore v1.9.5
6362
github.com/sirupsen/logrus v1.9.3
6463
github.com/spf13/pflag v1.0.10
65-
golang.org/x/crypto v0.44.0
64+
golang.org/x/crypto v0.46.0
6665
golang.org/x/oauth2 v0.33.0
67-
golang.org/x/sync v0.18.0
66+
golang.org/x/sync v0.19.0
6867
google.golang.org/api v0.256.0
69-
helm.sh/helm/v3 v3.19.2
68+
helm.sh/helm/v4 v4.0.4
7069
k8s.io/api v0.34.2
7170
k8s.io/apimachinery v0.34.2
7271
k8s.io/client-go v0.34.2
@@ -144,7 +143,6 @@ require (
144143
github.com/beorn7/perks v1.0.1 // indirect
145144
github.com/blang/semver v3.5.1+incompatible // indirect
146145
github.com/blang/semver/v4 v4.0.0 // indirect
147-
github.com/bradleyfalzon/ghinstallation/v2 v2.17.0 // indirect
148146
github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
149147
github.com/buildkite/agent/v3 v3.98.2 // indirect
150148
github.com/buildkite/go-pipeline v0.13.3 // indirect
@@ -159,11 +157,7 @@ require (
159157
github.com/cloudflare/circl v1.6.1 // indirect
160158
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
161159
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect
162-
github.com/containerd/containerd v1.7.29 // indirect
163160
github.com/containerd/continuity v0.4.5 // indirect
164-
github.com/containerd/errdefs v1.0.0 // indirect
165-
github.com/containerd/log v0.1.0 // indirect
166-
github.com/containerd/platforms v0.2.1 // indirect
167161
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
168162
github.com/coreos/go-oidc/v3 v3.16.0 // indirect
169163
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
@@ -181,13 +175,15 @@ require (
181175
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
182176
github.com/docker/go-metrics v0.0.1 // indirect
183177
github.com/dustin/go-humanize v1.0.1 // indirect
178+
github.com/dylibso/observe-sdk/go v0.0.0-20240819160327-2d926c5d788a // indirect
184179
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
185180
github.com/emirpasic/gods v1.18.1 // indirect
186181
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
187182
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
188183
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
189184
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
190185
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
186+
github.com/extism/go-sdk v1.7.1 // indirect
191187
github.com/fatih/color v1.18.0 // indirect
192188
github.com/felixge/httpsnoop v1.0.4 // indirect
193189
github.com/fluxcd/gitkit v0.6.0 // indirect
@@ -232,7 +228,7 @@ require (
232228
github.com/google/go-cmp v0.7.0 // indirect
233229
github.com/google/go-containerregistry/pkg/authn/kubernetes v0.0.0-20250225234217-098045d5e61f // indirect
234230
github.com/google/go-github/v72 v72.0.0 // indirect
235-
github.com/google/go-github/v75 v75.0.0 // indirect
231+
github.com/google/go-github/v81 v81.0.0 // indirect
236232
github.com/google/go-querystring v1.1.0 // indirect
237233
github.com/google/s2a-go v0.1.9 // indirect
238234
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
@@ -245,13 +241,12 @@ require (
245241
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
246242
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
247243
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
248-
github.com/hashicorp/errwrap v1.1.0 // indirect
249244
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
250-
github.com/hashicorp/go-multierror v1.1.1 // indirect
251245
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
252246
github.com/hashicorp/golang-lru/arc/v2 v2.0.5 // indirect
253247
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
254248
github.com/huandu/xstrings v1.5.0 // indirect
249+
github.com/ianlancetaylor/demangle v0.0.0-20240805132620-81f5be970eca // indirect
255250
github.com/in-toto/attestation v1.1.1 // indirect
256251
github.com/in-toto/in-toto-golang v0.9.0 // indirect
257252
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -344,6 +339,8 @@ require (
344339
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
345340
github.com/subosito/gotenv v1.6.0 // indirect
346341
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
342+
github.com/tetratelabs/wabin v0.0.0-20230304001439-f6f874872834 // indirect
343+
github.com/tetratelabs/wazero v1.9.0 // indirect
347344
github.com/thales-e-security/pool v0.0.2 // indirect
348345
github.com/theupdateframework/go-tuf v0.7.0 // indirect
349346
github.com/theupdateframework/go-tuf/v2 v2.1.1 // indirect
@@ -393,13 +390,13 @@ require (
393390
go.yaml.in/yaml/v2 v2.4.3 // indirect
394391
go.yaml.in/yaml/v3 v3.0.4 // indirect
395392
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
396-
golang.org/x/mod v0.29.0 // indirect
397-
golang.org/x/net v0.47.0 // indirect
398-
golang.org/x/sys v0.38.0 // indirect
399-
golang.org/x/term v0.37.0 // indirect
400-
golang.org/x/text v0.31.0 // indirect
393+
golang.org/x/mod v0.30.0 // indirect
394+
golang.org/x/net v0.48.0 // indirect
395+
golang.org/x/sys v0.39.0 // indirect
396+
golang.org/x/term v0.38.0 // indirect
397+
golang.org/x/text v0.32.0 // indirect
401398
golang.org/x/time v0.14.0 // indirect
402-
golang.org/x/tools v0.38.0 // indirect
399+
golang.org/x/tools v0.39.0 // indirect
403400
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
404401
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
405402
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect

0 commit comments

Comments
 (0)