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

Kubernetes-commit: 1aae77adac170f7eb3d2281c9a56db4ad9ee60ac
This commit is contained in:
Kubernetes Publisher
2019-11-04 15:25:34 +00:00
parent f7aefcc27e
commit fb3f879b30
3 changed files with 17 additions and 14 deletions
+8 -9
View File
@@ -5,10 +5,10 @@ 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-20191104115250-0fe51414ed68
k8s.io/apimachinery v0.0.0-20191104115250-650de2ebb2e8
k8s.io/client-go v0.0.0-20191104115250-60db0a7b4e4d
k8s.io/code-generator v0.0.0-20191031101217-cfc5e45aeb0c
k8s.io/klog v1.0.0
)
@@ -21,9 +21,8 @@ replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d
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-20191104115250-0fe51414ed68
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191104115250-650de2ebb2e8
k8s.io/client-go => k8s.io/client-go v0.0.0-20191104115250-60db0a7b4e4d
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191031101217-cfc5e45aeb0c
)