Merge pull request #107568 from jiahuif-forks/automated-cherry-pick-of-#107565-upstream-release-1.22

Automated cherry pick of #107565: upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1

Kubernetes-commit: 487eef699dc8ad07106876e7fb045962606035ec
This commit is contained in:
Kubernetes Publisher
2022-01-14 23:06:15 -08:00
parent 2960ab5924
commit 735ad8a955
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-20220115132223-0b924f4f7b63
k8s.io/apimachinery v0.0.0-20220115131919-1ea05acba7c0
k8s.io/client-go v0.0.0-20220115132708-74d341032456
k8s.io/code-generator v0.0.0-20220115131611-b45d7156bcec
k8s.io/klog/v2 v2.9.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-20220115132223-0b924f4f7b63
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220115131919-1ea05acba7c0
k8s.io/client-go => k8s.io/client-go v0.0.0-20220115132708-74d341032456
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220115131611-b45d7156bcec
)