Skip to content

Commit ef2f337

Browse files
dependabot[bot]mergify[bot]
authored andcommitted
build(deps): bump helm.sh/helm/v3 from 3.15.4 to 3.19.3 (#11733)
* build(deps): bump helm.sh/helm/v3 from 3.15.4 to 3.19.3 Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.15.4 to 3.19.3. - [Release notes](https://github.com/helm/helm/releases) - [Commits](helm/helm@v3.15.4...v3.19.3) --- updated-dependencies: - dependency-name: helm.sh/helm/v3 dependency-version: 3.19.3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Update EDOT go.mod * Update NOTICE.txt and/or NOTICE-fips.txt --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> (cherry picked from commit c7313c8) # Conflicts: # go.mod # go.sum # internal/edot/go.mod # internal/edot/go.sum
1 parent f7e782c commit ef2f337

File tree

6 files changed

+2952
-93
lines changed

6 files changed

+2952
-93
lines changed

NOTICE-fips.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11723,11 +11723,11 @@ Contents of probable licence file $GOMODCACHE/github.com/spf13/[email protected]/LIC
1172311723

1172411724
--------------------------------------------------------------------------------
1172511725
Dependency : github.com/spf13/pflag
11726-
Version: v1.0.9
11726+
Version: v1.0.10
1172711727
Licence type (autodetected): BSD-3-Clause
1172811728
--------------------------------------------------------------------------------
1172911729

11730-
Contents of probable licence file $GOMODCACHE/github.com/spf13/[email protected].9/LICENSE:
11730+
Contents of probable licence file $GOMODCACHE/github.com/spf13/[email protected].10/LICENSE:
1173111731

1173211732
Copyright (c) 2012 Alex Ogier. All rights reserved.
1173311733
Copyright (c) 2012 The Go Authors. All rights reserved.
@@ -48387,11 +48387,11 @@ Contents of probable licence file $GOMODCACHE/github.com/gomodule/[email protected]/
4838748387

4838848388
--------------------------------------------------------------------------------
4838948389
Dependency : github.com/google/cel-go
48390-
Version: v0.25.0
48390+
Version: v0.26.0
4839148391
Licence type (autodetected): Apache-2.0
4839248392
--------------------------------------------------------------------------------
4839348393

48394-
Contents of probable licence file $GOMODCACHE/github.com/google/cel-go@v0.25.0/LICENSE:
48394+
Contents of probable licence file $GOMODCACHE/github.com/google/cel-go@v0.26.0/LICENSE:
4839548395

4839648396

4839748397
Apache License

NOTICE.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12356,11 +12356,11 @@ Contents of probable licence file $GOMODCACHE/github.com/spf13/[email protected]/LIC
1235612356

1235712357
--------------------------------------------------------------------------------
1235812358
Dependency : github.com/spf13/pflag
12359-
Version: v1.0.9
12359+
Version: v1.0.10
1236012360
Licence type (autodetected): BSD-3-Clause
1236112361
--------------------------------------------------------------------------------
1236212362

12363-
Contents of probable licence file $GOMODCACHE/github.com/spf13/[email protected].9/LICENSE:
12363+
Contents of probable licence file $GOMODCACHE/github.com/spf13/[email protected].10/LICENSE:
1236412364

1236512365
Copyright (c) 2012 Alex Ogier. All rights reserved.
1236612366
Copyright (c) 2012 The Go Authors. All rights reserved.
@@ -52407,11 +52407,11 @@ Contents of probable licence file $GOMODCACHE/github.com/gomodule/[email protected]/
5240752407

5240852408
--------------------------------------------------------------------------------
5240952409
Dependency : github.com/google/cel-go
52410-
Version: v0.25.0
52410+
Version: v0.26.0
5241152411
Licence type (autodetected): Apache-2.0
5241252412
--------------------------------------------------------------------------------
5241352413

52414-
Contents of probable licence file $GOMODCACHE/github.com/google/cel-go@v0.25.0/LICENSE:
52414+
Contents of probable licence file $GOMODCACHE/github.com/google/cel-go@v0.26.0/LICENSE:
5241552415

5241652416

5241752417
Apache License

go.mod

Lines changed: 49 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ require (
7070
github.com/sajari/regression v1.0.1
7171
github.com/schollz/progressbar/v3 v3.13.1
7272
github.com/spf13/cobra v1.10.1
73-
github.com/spf13/pflag v1.0.9
73+
github.com/spf13/pflag v1.0.10
7474
github.com/stretchr/testify v1.11.1
7575
github.com/winlabs/gowin32 v0.0.0-20240930213947-f504d7e14639
7676
go.elastic.co/apm/module/apmgorilla/v2 v2.6.0
@@ -105,15 +105,24 @@ require (
105105
gopkg.in/yaml.v2 v2.4.0
106106
gopkg.in/yaml.v3 v3.0.1
107107
gotest.tools/gotestsum v1.13.0
108+
<<<<<<< HEAD
108109
helm.sh/helm/v3 v3.15.4
109110
k8s.io/api v0.32.3
110111
k8s.io/apimachinery v0.32.3
111112
k8s.io/cli-runtime v0.32.2
112113
k8s.io/client-go v0.32.3
114+
=======
115+
helm.sh/helm/v3 v3.19.3
116+
howett.net/plist v1.0.1
117+
k8s.io/api v0.34.1
118+
k8s.io/apimachinery v0.34.1
119+
k8s.io/cli-runtime v0.34.0
120+
k8s.io/client-go v0.34.1
121+
>>>>>>> c7313c8b9 (build(deps): bump helm.sh/helm/v3 from 3.15.4 to 3.19.3 (#11733))
113122
kernel.org/pub/linux/libs/security/libcap/cap v1.2.70
114123
sigs.k8s.io/e2e-framework v0.4.0
115-
sigs.k8s.io/kustomize/api v0.18.0
116-
sigs.k8s.io/kustomize/kyaml v0.18.1
124+
sigs.k8s.io/kustomize/api v0.20.1
125+
sigs.k8s.io/kustomize/kyaml v0.20.1
117126
)
118127

119128
require (
@@ -212,7 +221,7 @@ require (
212221
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
213222
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
214223
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
215-
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
224+
github.com/BurntSushi/toml v1.5.0 // indirect
216225
github.com/Code-Hex/go-generics-cache v1.5.1 // indirect
217226
github.com/DataDog/zstd v1.5.6 // indirect
218227
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
@@ -222,10 +231,9 @@ require (
222231
github.com/MakeNowJust/heredoc v1.0.0 // indirect
223232
github.com/Masterminds/goutils v1.1.1 // indirect
224233
github.com/Masterminds/semver v1.5.0 // indirect
225-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
234+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
226235
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
227236
github.com/Masterminds/squirrel v1.5.4 // indirect
228-
github.com/Microsoft/hcsshim v0.12.5 // indirect
229237
github.com/OneOfOne/xxhash v1.2.8 // indirect
230238
github.com/PaesslerAG/gval v1.2.2 // indirect
231239
github.com/PaesslerAG/jsonpath v0.1.1 // indirect
@@ -299,16 +307,25 @@ require (
299307
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 // indirect
300308
github.com/cockroachdb/pebble v1.1.5 // indirect
301309
github.com/cockroachdb/redact v1.1.6 // indirect
310+
<<<<<<< HEAD
302311
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
303312
github.com/containerd/containerd v1.7.27 // indirect
313+
=======
314+
github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb // indirect
315+
github.com/containerd/containerd v1.7.29 // indirect
316+
>>>>>>> c7313c8b9 (build(deps): bump helm.sh/helm/v3 from 3.15.4 to 3.19.3 (#11733))
304317
github.com/containerd/errdefs v1.0.0 // indirect
305318
github.com/containerd/errdefs/pkg v0.3.0 // indirect
306319
github.com/containerd/log v0.1.0 // indirect
307320
github.com/containerd/platforms v0.2.1 // indirect
308321
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
309322
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
323+
<<<<<<< HEAD
310324
github.com/creack/pty v1.1.20 // indirect
311325
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
326+
=======
327+
github.com/cyphar/filepath-securejoin v0.6.0 // indirect
328+
>>>>>>> c7313c8b9 (build(deps): bump helm.sh/helm/v3 from 3.15.4 to 3.19.3 (#11733))
312329
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
313330
github.com/dennwc/varint v1.0.0 // indirect
314331
github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2 // indirect
@@ -321,13 +338,15 @@ require (
321338
github.com/dimchansky/utfbom v1.1.1 // indirect
322339
github.com/dlclark/regexp2 v1.11.5 // indirect
323340
github.com/dnephin/pflag v1.0.7 // indirect
324-
github.com/docker/cli v27.5.0+incompatible // indirect
325-
github.com/docker/distribution v2.8.3+incompatible // indirect
326-
github.com/docker/docker-credential-helpers v0.8.2 // indirect
327341
github.com/docker/go-connections v0.6.0 // indirect
342+
<<<<<<< HEAD
328343
github.com/docker/go-metrics v0.0.1 // indirect
329344
github.com/dop251/goja v0.0.0-20250309171923-bcd7cc6bf64c // indirect
330345
github.com/dop251/goja_nodejs v0.0.0-20250309172600-86a40d630cdd // indirect
346+
=======
347+
github.com/dop251/goja v0.0.0-20250630131328-58d95d85e994 // indirect
348+
github.com/dop251/goja_nodejs v0.0.0-20250409162600-f7acab6894b0 // indirect
349+
>>>>>>> c7313c8b9 (build(deps): bump helm.sh/helm/v3 from 3.15.4 to 3.19.3 (#11733))
331350
github.com/dustin/go-humanize v1.0.1 // indirect
332351
github.com/eapache/go-resiliency v1.7.0 // indirect
333352
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
@@ -356,7 +375,7 @@ require (
356375
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
357376
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
358377
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
359-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
378+
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
360379
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
361380
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
362381
github.com/expr-lang/expr v1.17.6 // indirect
@@ -411,7 +430,7 @@ require (
411430
github.com/golang/snappy v1.0.0 // indirect
412431
github.com/gomodule/redigo v1.8.3 // indirect
413432
github.com/google/btree v1.1.3 // indirect
414-
github.com/google/cel-go v0.25.0 // indirect
433+
github.com/google/cel-go v0.26.0 // indirect
415434
github.com/google/flatbuffers v25.2.10+incompatible // indirect
416435
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
417436
github.com/google/go-querystring v1.1.0 // indirect
@@ -507,10 +526,13 @@ require (
507526
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
508527
github.com/mitchellh/reflectwalk v1.0.2 // indirect
509528
github.com/moby/docker-image-spec v1.3.1 // indirect
510-
github.com/moby/locker v1.0.1 // indirect
511529
github.com/moby/spdystream v0.5.0 // indirect
530+
<<<<<<< HEAD
512531
github.com/moby/sys/mountinfo v0.7.2 // indirect
513532
github.com/moby/term v0.5.0 // indirect
533+
=======
534+
github.com/moby/term v0.5.2 // indirect
535+
>>>>>>> c7313c8b9 (build(deps): bump helm.sh/helm/v3 from 3.15.4 to 3.19.3 (#11733))
514536
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
515537
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
516538
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
@@ -587,9 +609,14 @@ require (
587609
github.com/rivo/uniseg v0.4.7 // indirect
588610
github.com/rogpeppe/go-internal v1.14.1 // indirect
589611
github.com/rs/cors v1.11.1 // indirect
590-
github.com/rubenv/sql-migrate v1.5.2 // indirect
612+
github.com/rubenv/sql-migrate v1.8.0 // indirect
591613
github.com/russross/blackfriday/v2 v2.1.0 // indirect
614+
<<<<<<< HEAD
592615
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33 // indirect
616+
=======
617+
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
618+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35 // indirect
619+
>>>>>>> c7313c8b9 (build(deps): bump helm.sh/helm/v3 from 3.15.4 to 3.19.3 (#11733))
593620
github.com/segmentio/fasthash v1.0.3 // indirect
594621
github.com/sergi/go-diff v1.3.1 // indirect
595622
github.com/shirou/gopsutil/v4 v4.25.8 // indirect
@@ -624,8 +651,6 @@ require (
624651
github.com/xdg-go/scram v1.1.2 // indirect
625652
github.com/xdg-go/stringprep v1.0.4 // indirect
626653
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
627-
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
628-
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
629654
github.com/xlab/treeprint v1.2.0 // indirect
630655
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
631656
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
@@ -738,16 +763,24 @@ require (
738763
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
739764
gopkg.in/inf.v0 v0.9.1 // indirect
740765
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
766+
<<<<<<< HEAD
741767
howett.net/plist v1.0.1 // indirect
742768
k8s.io/apiextensions-apiserver v0.32.2 // indirect
743769
k8s.io/apiserver v0.32.3 // indirect
744770
k8s.io/component-base v0.32.3 // indirect
745771
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
746772
k8s.io/kubectl v0.32.2 // indirect
773+
=======
774+
k8s.io/apiextensions-apiserver v0.34.0 // indirect
775+
k8s.io/apiserver v0.34.0 // indirect
776+
k8s.io/component-base v0.34.0 // indirect
777+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
778+
k8s.io/kubectl v0.34.0 // indirect
779+
>>>>>>> c7313c8b9 (build(deps): bump helm.sh/helm/v3 from 3.15.4 to 3.19.3 (#11733))
747780
k8s.io/kubelet v0.32.3 // indirect
748781
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
749782
kernel.org/pub/linux/libs/security/libcap/psx v1.2.70 // indirect
750-
oras.land/oras-go v1.2.5 // indirect
783+
oras.land/oras-go/v2 v2.6.0 // indirect
751784
sigs.k8s.io/controller-runtime v0.20.4 // indirect
752785
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
753786
sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect

0 commit comments

Comments
 (0)