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

Kubernetes-commit: 223a4e974f77c585bd47ce008c3d6f80ded653dd
This commit is contained in:
Kubernetes Publisher
2020-07-21 13:39:46 +00:00
parent 5891c585d3
commit a623e63f4a
3 changed files with 15 additions and 12 deletions
+8 -9
View File
@@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.13
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-20200717102341-0bfda2331c3c
k8s.io/apimachinery v0.0.0-20200712171229-2c8b1211fea9
k8s.io/client-go v0.0.0-20200721132109-b6011de30ee5
k8s.io/code-generator v0.0.0-20200712171229-f87d2adcd297
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-20200717102341-0bfda2331c3c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200712171229-2c8b1211fea9
k8s.io/client-go => k8s.io/client-go v0.0.0-20200721132109-b6011de30ee5
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200712171229-f87d2adcd297
)