Merge pull request #106661 from liggitt/automated-cherry-pick-of-#106660-upstream-release-1.23

Automated cherry pick of #106660: Revert sigs.k8s.io/structured-merge-diff/v4 to v4.1.2

Kubernetes-commit: 724289524084f6edbbe53e31d2c6e636343fdebb
This commit is contained in:
Kubernetes Publisher
2021-12-03 10:00:31 +00:00
parent 4f5033a5b2
commit b1f957b124
2 changed files with 16 additions and 9 deletions
+8 -9
View File
@@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.16
require (
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-20211203090506-2893881082f7
k8s.io/apimachinery v0.0.0-20211203085806-1d209c836ad2
k8s.io/client-go v0.0.0-20211203092021-f3c25ef2e88a
k8s.io/code-generator v0.0.0-20211203085103-5266a1f1e9a2
k8s.io/klog/v2 v2.30.0
)
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
k8s.io/api => k8s.io/api v0.0.0-20211203090506-2893881082f7
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211203085806-1d209c836ad2
k8s.io/client-go => k8s.io/client-go v0.0.0-20211203092021-f3c25ef2e88a
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211203085103-5266a1f1e9a2
)