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

Kubernetes-commit: 490f4bacd293561bd0b5b785f30c666d99ecaeec
This commit is contained in:
Kubernetes Publisher
2020-02-23 12:50:16 +00:00
parent 9f602dfb55
commit 21b900fa86
3 changed files with 18 additions and 15 deletions
+8 -9
View File
@@ -5,19 +5,18 @@ 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-20200214081624-026463abc787
k8s.io/apimachinery v0.0.0-20200214081019-2373d029717c
k8s.io/client-go v0.0.0-20200221134140-39a9bc1d5a52
k8s.io/code-generator v0.0.0-20200223121935-f7c31974df11
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-20200214081624-026463abc787
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200214081019-2373d029717c
k8s.io/client-go => k8s.io/client-go v0.0.0-20200221134140-39a9bc1d5a52
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200223121935-f7c31974df11
)