Update vendor k8s-cloud-provider and google API

Ran commands:
hack/pin-dependency.sh github.com/GoogleCloudPlatform/k8s-cloud-provider 27a4ced34534a6c32b63159b100ac0efaa1d37b3
hack/update-vendor.sh

hack/pin-dependency.sh google.golang.org/api 5213b809086156e6e2b262a41394993fcff97439
hack/update-vendor.sh

hack/verify-vendor.sh

merge conflicts

Kubernetes-commit: ce3b145e7369da6c1179346a4e6f4f9992d235b7
This commit is contained in:
Pavithra Ramesh
2019-08-23 15:51:45 -07:00
committed by Kubernetes Publisher
parent 8df6f90ea0
commit da203f3b6d
2 changed files with 45 additions and 13 deletions
+12 -8
View File
@@ -5,20 +5,24 @@ module k8s.io/sample-controller
go 1.12
require (
k8s.io/api v0.0.0-20190820101039-d651a1528133
k8s.io/apimachinery v0.0.0-20190826114657-e31a5531b558
k8s.io/client-go v0.0.0-20190826115323-cc5a7c7149a7
k8s.io/code-generator v0.0.0-20190826114438-f795916aae3f
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/klog v0.4.0
)
replace (
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20181025213731-e84da0312774
golang.org/x/lint => golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1
golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a
golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
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
k8s.io/api => k8s.io/api v0.0.0-20190820101039-d651a1528133
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190826114657-e31a5531b558
k8s.io/client-go => k8s.io/client-go v0.0.0-20190826115323-cc5a7c7149a7
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190826114438-f795916aae3f
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
)