Skip to content

Commit 745ae75

Browse files
liggittliggitt
committed
Update vendor
1 parent 4d8cbad commit 745ae75

File tree

46 files changed

+2
-985
lines changed

Some content is hidden

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

46 files changed

+2
-985
lines changed

‎LICENSES/vendor/github.com/imdario/mergo/LICENSE

-32
This file was deleted.

‎go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ require (
170170
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
171171
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
172172
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
173-
github.com/imdario/mergo v0.3.6 // indirect
174173
github.com/inconshreveable/mousetrap v1.1.0 // indirect
175174
github.com/jonboulle/clockwork v0.2.2 // indirect
176175
github.com/josharian/intern v1.0.0 // indirect

‎go.sum

-2
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,6 @@ github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFb
377377
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0=
378378
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k=
379379
github.com/ianlancetaylor/demangle v0.0.0-20240312041847-bd984b5ce465/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
380-
github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
381-
github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
382380
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
383381
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
384382
github.com/ishidawataru/sctp v0.0.0-20230406120618-7ff4192f6ff2 h1:i2fYnDurfLlJH8AyyMOnkLHnHeP8Ff/DDpuZA/D3bPo=

‎hack/unwanted-dependencies.json

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"cloud.google.com/go/compute": "cloud dependency",
77
"cloud.google.com/go/firestore": "db/datastore clients should not be required",
88
"cloud.google.com/go/storage": "cloud dependency",
9+
"dario.cat/mergo": "see https://github.com/kubernetes/kubernetes/issues/107499",
910
"github.com/GoogleCloudPlatform/k8s-cloud-provider": "cloud dependency",
1011
"github.com/PuerkitoBio/urlesc": "unmaintained, archive mode",
1112
"github.com/armon/consul-api": "MPL license not in CNCF allowlist",
@@ -46,6 +47,7 @@
4647
"github.com/hashicorp/logutils": "MPL license not in CNCF allowlist",
4748
"github.com/hashicorp/memberlist": "MPL license not in CNCF allowlist",
4849
"github.com/hashicorp/serf": "MPL license not in CNCF allowlist",
50+
"github.com/imdario/mergo": "see https://github.com/kubernetes/kubernetes/issues/107499",
4951
"github.com/influxdata/influxdb1-client": "db/datastore clients should not be required",
5052
"github.com/json-iterator/go": "refer to #105030",
5153
"github.com/mailru/easyjson": "unmaintained",

‎staging/src/k8s.io/apiextensions-apiserver/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ require (
6868
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
6969
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
7070
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
71-
github.com/imdario/mergo v0.3.6 // indirect
7271
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7372
github.com/jonboulle/clockwork v0.2.2 // indirect
7473
github.com/josharian/intern v1.0.0 // indirect

‎staging/src/k8s.io/apiextensions-apiserver/go.sum

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apiserver/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ require (
8585
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
8686
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
8787
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
88-
github.com/imdario/mergo v0.3.6 // indirect
8988
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9089
github.com/jonboulle/clockwork v0.2.2 // indirect
9190
github.com/josharian/intern v1.0.0 // indirect

‎staging/src/k8s.io/apiserver/go.sum

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/cli-runtime/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ require (
4747
github.com/google/gofuzz v1.2.0 // indirect
4848
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
4949
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
50-
github.com/imdario/mergo v0.3.6 // indirect
5150
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5251
github.com/josharian/intern v1.0.0 // indirect
5352
github.com/json-iterator/go v1.1.12 // indirect

‎staging/src/k8s.io/cli-runtime/go.sum

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/client-go/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ require (
1616
github.com/google/uuid v1.6.0
1717
github.com/gorilla/websocket v1.5.0
1818
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7
19-
github.com/imdario/mergo v0.3.6
2019
github.com/peterbourgon/diskv v2.0.1+incompatible
2120
github.com/spf13/pflag v1.0.5
2221
github.com/stretchr/testify v1.9.0

‎staging/src/k8s.io/client-go/go.sum

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/cloud-provider/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ require (
5353
github.com/google/uuid v1.6.0 // indirect
5454
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
5555
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
56-
github.com/imdario/mergo v0.3.6 // indirect
5756
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5857
github.com/josharian/intern v1.0.0 // indirect
5958
github.com/json-iterator/go v1.1.12 // indirect

‎staging/src/k8s.io/cloud-provider/go.sum

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/component-base/go.sum

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/component-helpers/go.sum

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/controller-manager/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ require (
4949
github.com/google/uuid v1.6.0 // indirect
5050
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
5151
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
52-
github.com/imdario/mergo v0.3.6 // indirect
5352
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5453
github.com/josharian/intern v1.0.0 // indirect
5554
github.com/json-iterator/go v1.1.12 // indirect

‎staging/src/k8s.io/controller-manager/go.sum

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/cri-client/go.sum

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/dynamic-resource-allocation/go.sum

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/endpointslice/go.sum

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/kube-aggregator/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ require (
5757
github.com/gorilla/websocket v1.5.0 // indirect
5858
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
5959
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
60-
github.com/imdario/mergo v0.3.6 // indirect
6160
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6261
github.com/josharian/intern v1.0.0 // indirect
6362
github.com/json-iterator/go v1.1.12 // indirect

‎staging/src/k8s.io/kube-aggregator/go.sum

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/kube-controller-manager/go.sum

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/kubectl/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ require (
6868
github.com/google/uuid v1.6.0 // indirect
6969
github.com/gorilla/websocket v1.5.0 // indirect
7070
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
71-
github.com/imdario/mergo v0.3.6 // indirect
7271
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7372
github.com/josharian/intern v1.0.0 // indirect
7473
github.com/json-iterator/go v1.1.12 // indirect

‎staging/src/k8s.io/kubectl/go.sum

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/kubelet/go.sum

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)