Merge remote-tracking branch 'origin/master' into release-1.19

Kubernetes-commit: 313e6e71a0631d58c7f9e710035df38855f2bcdb
This commit is contained in:
Kubernetes Publisher
2020-08-02 14:00:18 +00:00
parent 752549ec20
commit 7939dc1a07
3 changed files with 15 additions and 12 deletions
+8 -9
View File
@@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.15
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-20200731080027-e83062b676e4
k8s.io/apimachinery v0.0.0-20200727091313-7efdc26a675c
k8s.io/client-go v0.0.0-20200802124002-470e5168e52f
k8s.io/code-generator v0.0.0-20200727091120-649de32797ee
k8s.io/klog/v2 v2.2.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-20200731080027-e83062b676e4
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200727091313-7efdc26a675c
k8s.io/client-go => k8s.io/client-go v0.0.0-20200802124002-470e5168e52f
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200727091120-649de32797ee
)