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

Kubernetes-commit: 486425533b66fa3ce13c2ef480061520ef584ff4
This commit is contained in:
Kubernetes Publisher
2019-11-21 18:13:05 +00:00
parent 6ffe9e5203
commit e6c2112911
3 changed files with 20 additions and 17 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-20191121175643-4ed536977f46
k8s.io/apimachinery v0.0.0-20191121175448-79c2a76c473a
k8s.io/client-go v0.0.0-20191121175918-3a262fe58afa
k8s.io/code-generator v0.0.0-20191121175249-e95606b614f0
k8s.io/klog v1.0.0
)
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
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-20191121175643-4ed536977f46
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191121175448-79c2a76c473a
k8s.io/client-go => k8s.io/client-go v0.0.0-20191121175918-3a262fe58afa
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191121175249-e95606b614f0
)