Merge pull request #106660 from liggitt/smd-merge

Revert sigs.k8s.io/structured-merge-diff/v4 to v4.1.2

Kubernetes-commit: aff056d8a197f6a404ad5e02210ca662d16c3dbe
This commit is contained in:
Kubernetes Publisher
2021-11-24 13:37:31 -08:00
parent d8df7de944
commit ff730d68ab
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-20211124232210-4c321cf829a0
k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a
k8s.io/client-go v0.0.0-20211124232522-ad95a77727e6
k8s.io/code-generator v0.0.0-20211124231748-1685c0469510
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-20211124232210-4c321cf829a0
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a
k8s.io/client-go => k8s.io/client-go v0.0.0-20211124232522-ad95a77727e6
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211124231748-1685c0469510
)