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

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

Kubernetes-commit: 80b625cdfb1b5af2fb545187e9fab045ef71858b
This commit is contained in:
Kubernetes Publisher
2022-01-15 06:34:16 +00:00
parent c3e9f6dc1a
commit f858f0b7ec
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-20220115052846-e18a4d4fc464
k8s.io/apimachinery v0.0.0-20220115052204-78994e499d98
k8s.io/client-go v0.0.0-20220115054131-b3fbf6e0969c
k8s.io/code-generator v0.0.0-20220115051636-a8e5007e73e6
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-20220115052846-e18a4d4fc464
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220115052204-78994e499d98
k8s.io/client-go => k8s.io/client-go v0.0.0-20220115054131-b3fbf6e0969c
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220115051636-a8e5007e73e6
)