Skip to content

Commit 17d2bcf

Browse files
authored
build(deps): update github.com/imdario/mergo to dario.cat/mergo (#14544)
Dependabot missed updating this dependency. No breaking changes, only the module path update. Reference: https://github.com/darccio/mergo/releases/tag/v1.0.0 Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
1 parent c02b891 commit 17d2bcf

File tree

3 files changed

+16
-22
lines changed

3 files changed

+16
-22
lines changed

go.mod

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ go 1.25.0
44

55
require (
66
contrib.go.opencensus.io/exporter/ocagent v0.7.0
7+
dario.cat/mergo v1.0.2
78
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24
89
github.com/bombsimon/logrusr/v4 v4.1.0
910
github.com/briandowns/spinner v1.23.2
@@ -18,7 +19,6 @@ require (
1819
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674
1920
github.com/grantae/certinfo v0.0.0-20170412194111-59d56a35515b
2021
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
21-
github.com/imdario/mergo v0.3.16
2222
github.com/julienschmidt/httprouter v1.3.0
2323
github.com/linkerd/linkerd2-proxy-api v0.17.0
2424
github.com/mattn/go-isatty v0.0.20
@@ -56,22 +56,6 @@ require (
5656
)
5757

5858
require (
59-
github.com/clipperhouse/uax29/v2 v2.2.0 // indirect
60-
github.com/go-openapi/swag/conv v0.25.1 // indirect
61-
github.com/go-openapi/swag/jsonname v0.25.1 // indirect
62-
github.com/go-openapi/swag/jsonutils v0.25.1 // indirect
63-
github.com/go-openapi/swag/loading v0.25.1 // indirect
64-
github.com/go-openapi/swag/stringutils v0.25.1 // indirect
65-
github.com/go-openapi/swag/typeutils v0.25.1 // indirect
66-
github.com/go-openapi/swag/yamlutils v0.25.1 // indirect
67-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
68-
golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 // indirect
69-
golang.org/x/tools/godoc v0.1.0-deprecated // indirect
70-
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
71-
)
72-
73-
require (
74-
dario.cat/mergo v1.0.1 // indirect
7559
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
7660
github.com/BurntSushi/toml v1.5.0 // indirect
7761
github.com/MakeNowJust/heredoc v1.0.0 // indirect
@@ -83,6 +67,7 @@ require (
8367
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
8468
github.com/cespare/xxhash/v2 v2.3.0 // indirect
8569
github.com/chai2010/gettext-go v1.0.2 // indirect
70+
github.com/clipperhouse/uax29/v2 v2.2.0 // indirect
8671
github.com/containerd/containerd v1.7.28 // indirect
8772
github.com/containerd/errdefs v0.3.0 // indirect
8873
github.com/containerd/log v0.1.0 // indirect
@@ -98,6 +83,13 @@ require (
9883
github.com/go-openapi/jsonpointer v0.22.1 // indirect
9984
github.com/go-openapi/jsonreference v0.21.2 // indirect
10085
github.com/go-openapi/swag v0.23.0 // indirect
86+
github.com/go-openapi/swag/conv v0.25.1 // indirect
87+
github.com/go-openapi/swag/jsonname v0.25.1 // indirect
88+
github.com/go-openapi/swag/jsonutils v0.25.1 // indirect
89+
github.com/go-openapi/swag/loading v0.25.1 // indirect
90+
github.com/go-openapi/swag/stringutils v0.25.1 // indirect
91+
github.com/go-openapi/swag/typeutils v0.25.1 // indirect
92+
github.com/go-openapi/swag/yamlutils v0.25.1 // indirect
10193
github.com/gobwas/glob v0.2.3 // indirect
10294
github.com/gogo/protobuf v1.3.2 // indirect
10395
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -133,6 +125,7 @@ require (
133125
github.com/opencontainers/image-spec v1.1.1 // indirect
134126
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
135127
github.com/pkg/errors v0.9.1 // indirect
128+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
136129
github.com/prometheus/procfs v0.16.1 // indirect
137130
github.com/russross/blackfriday/v2 v2.1.0 // indirect
138131
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
@@ -150,10 +143,12 @@ require (
150143
golang.org/x/oauth2 v0.31.0 // indirect
151144
golang.org/x/sync v0.17.0 // indirect
152145
golang.org/x/sys v0.36.0 // indirect
146+
golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 // indirect
153147
golang.org/x/term v0.35.0 // indirect
154148
golang.org/x/text v0.29.0 // indirect
155149
golang.org/x/time v0.12.0 // indirect
156150
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
151+
golang.org/x/tools/godoc v0.1.0-deprecated // indirect
157152
google.golang.org/api v0.143.0 // indirect
158153
google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b // indirect
159154
google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
@@ -170,4 +165,5 @@ require (
170165
sigs.k8s.io/kustomize/api v0.20.1 // indirect
171166
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect; indirecxt
172167
sigs.k8s.io/randfill v1.0.0 // indirect
168+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
173169
)

go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
2222
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
2323
contrib.go.opencensus.io/exporter/ocagent v0.7.0 h1:BEfdCTXfMV30tLZD8c9n64V/tIZX5+9sXiuFLnrr1k8=
2424
contrib.go.opencensus.io/exporter/ocagent v0.7.0/go.mod h1:IshRmMJBhDfFj5Y67nVhMYTTIze91RUeT73ipWKs/GY=
25-
dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
26-
dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
25+
dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
26+
dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
2727
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
2828
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=
2929
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
@@ -257,8 +257,6 @@ github.com/hashicorp/golang-lru/v2 v2.0.5/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyf
257257
github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI=
258258
github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
259259
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
260-
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
261-
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
262260
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
263261
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
264262
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=

pkg/charts/linkerd2/values.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"errors"
55
"fmt"
66

7-
"github.com/imdario/mergo"
7+
"dario.cat/mergo"
88
"github.com/linkerd/linkerd2/charts"
99
chartspkg "github.com/linkerd/linkerd2/pkg/charts"
1010
"github.com/linkerd/linkerd2/pkg/k8s"

0 commit comments

Comments
 (0)