Merge pull request #79303 from liggitt/preferred-deps

Use preferred dependency versions

Kubernetes-commit: dc764030c2cef7aced8dd1a9e3b5ca389223b8b6
This commit is contained in:
Kubernetes Publisher 2019-06-23 23:03:56 -07:00
parent 834b026c0c
commit 64a1a79d9c
3 changed files with 11 additions and 8 deletions

6
Godeps/Godeps.json generated
View File

@ -56,7 +56,7 @@
},
{
"ImportPath": "github.com/google/uuid",
"Rev": "v1.0.0"
"Rev": "v1.1.1"
},
{
"ImportPath": "github.com/googleapis/gnostic",
@ -172,11 +172,11 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "d16981aedf33"
"Rev": "961b39a1baa0"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "e5083e713460"
"Rev": "dd74dcc4bb91"
},
{
"ImportPath": "k8s.io/klog",

11
go.mod
View File

@ -5,8 +5,8 @@ module k8s.io/kube-controller-manager
go 1.12
require (
k8s.io/apimachinery v0.0.0
k8s.io/component-base v0.0.0
k8s.io/apimachinery v0.0.0-20190624085041-961b39a1baa0
k8s.io/component-base v0.0.0-20190624085813-dd74dcc4bb91
)
replace (
@ -14,7 +14,8 @@ replace (
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/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
k8s.io/apimachinery => ../apimachinery
k8s.io/component-base => ../component-base
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190624085041-961b39a1baa0
k8s.io/component-base => k8s.io/component-base v0.0.0-20190624085813-dd74dcc4bb91
)
replace k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190624090026-adc580de659e

2
go.sum
View File

@ -59,6 +59,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/apimachinery v0.0.0-20190624085041-961b39a1baa0/go.mod h1:48PVecD7ubRgJmMRGIQfsqYu6OucVH5DzFNtACHZH8k=
k8s.io/component-base v0.0.0-20190624085813-dd74dcc4bb91/go.mod h1:rzptoTTLijQSUO6SiDWhyXGRbVquvfM7QY0fvdPyXSU=
k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=
k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=