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

Kubernetes-commit: 53697d28302afd7d2b1e453ad26c2593ed7de5aa
This commit is contained in:
Kubernetes Publisher
2019-11-07 11:36:56 +00:00
parent 5c5166afe2
commit dbbf10cb31
3 changed files with 35 additions and 28 deletions
+8 -9
View File
@@ -5,19 +5,18 @@ module k8s.io/sample-controller
go 1.12
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-20191107110442-43b1ad33cf6f
k8s.io/apimachinery v0.0.0-20191107082716-9c5262af35ca
k8s.io/client-go v0.0.0-20191107082716-4fb1ca18cab3
k8s.io/code-generator v0.0.0-20191107105627-70ddc72eda71
k8s.io/klog v1.0.0
)
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7
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-20191107110442-43b1ad33cf6f
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191107082716-9c5262af35ca
k8s.io/client-go => k8s.io/client-go v0.0.0-20191107082716-4fb1ca18cab3
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191107105627-70ddc72eda71
)