kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 537807fe63
commit 63dc176b51
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Godeps/Godeps.json generated
View File

@ -20,7 +20,7 @@
},
{
"ImportPath": "github.com/BurntSushi/toml",
"Rev": "v0.3.0"
"Rev": "v0.3.1"
},
{
"ImportPath": "github.com/MakeNowJust/heredoc",
@ -100,7 +100,7 @@
},
{
"ImportPath": "github.com/google/uuid",
"Rev": "v1.0.0"
"Rev": "v1.1.1"
},
{
"ImportPath": "github.com/googleapis/gnostic",
@ -120,7 +120,7 @@
},
{
"ImportPath": "github.com/hashicorp/hcl",
"Rev": "d8c773c4cba1"
"Rev": "v1.0.0"
},
{
"ImportPath": "github.com/hpcloud/tail",
@ -308,15 +308,15 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "dcce3486da33"
"Rev": "95846d7ef82a"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "d16981aedf33"
"Rev": "961b39a1baa0"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "585a16d2e773"
"Rev": "2c6e35a5b9cf"
},
{
"ImportPath": "k8s.io/klog",

10
go.mod
View File

@ -17,8 +17,8 @@ require (
github.com/spf13/pflag v1.0.3
golang.org/x/sys v0.0.0-20190312061237-fead79001313
gotest.tools v2.2.0+incompatible // indirect
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/apimachinery v0.0.0-20190624085041-961b39a1baa0
k8s.io/client-go v0.0.0-20190624085356-2c6e35a5b9cf
)
replace (
@ -27,8 +27,6 @@ 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/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/kubectl => ../kubectl
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190624085041-961b39a1baa0
k8s.io/client-go => k8s.io/client-go v0.0.0-20190624085356-2c6e35a5b9cf
)

3
go.sum
View File

@ -118,6 +118,9 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
k8s.io/api v0.0.0-20190624085159-95846d7ef82a/go.mod h1:O6YAz5STgv7S1/c/XtBULGhSltH7yWEHpWvnA1mmFRg=
k8s.io/apimachinery v0.0.0-20190624085041-961b39a1baa0/go.mod h1:48PVecD7ubRgJmMRGIQfsqYu6OucVH5DzFNtACHZH8k=
k8s.io/client-go v0.0.0-20190624085356-2c6e35a5b9cf/go.mod h1:rQMvHbaXi4pHSLf91Z1YI3h2Av+T3jsFKEIAWucw7hc=
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=