Merge pull request #126764 from liggitt/mergo

reimplement merge to drop mergo dependency

Kubernetes-commit: ee74baec6e05afde972f1a8705d4f8efe066f120
This commit is contained in:
Kubernetes Publisher
2024-09-28 08:52:17 +00:00
parent 05c2b2776c
commit 0baada3a93
2 changed files with 12 additions and 25 deletions
+4 -12
View File
@@ -8,10 +8,10 @@ godebug default=go1.23
require (
golang.org/x/time v0.3.0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/api v0.0.0-20240920202009-71385f038c10
k8s.io/apimachinery v0.0.0-20240926041705-dc03077c038e
k8s.io/client-go v0.0.0-20240928082459-2d7a47c42bfc
k8s.io/code-generator v0.0.0-20240928043524-06ae20b53fb1
k8s.io/klog/v2 v2.130.1
)
@@ -59,11 +59,3 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
)