diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index bf55be9a2..70f806af5 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -568,7 +568,7 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "0b68d4126df6" + "Rev": "037303d07dad" }, { "ImportPath": "k8s.io/apimachinery", @@ -576,11 +576,11 @@ }, { "ImportPath": "k8s.io/cli-runtime", - "Rev": "f80ad1dc527b" + "Rev": "f26b0857ea34" }, { "ImportPath": "k8s.io/client-go", - "Rev": "03ea99686473" + "Rev": "f12177f0a965" }, { "ImportPath": "k8s.io/code-generator", diff --git a/go.mod b/go.mod index 01420c5d8..4be6ca817 100644 --- a/go.mod +++ b/go.mod @@ -36,10 +36,10 @@ require ( golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7 gopkg.in/yaml.v2 v2.2.8 gotest.tools v2.2.0+incompatible // indirect - k8s.io/api v0.0.0-20200304042242-0b68d4126df6 + k8s.io/api v0.0.0-20200304122248-037303d07dad k8s.io/apimachinery v0.0.0-20200303201514-6584f51ae935 - k8s.io/cli-runtime v0.0.0-20200304084510-f80ad1dc527b - k8s.io/client-go v0.0.0-20200304082526-03ea99686473 + k8s.io/cli-runtime v0.0.0-20200304164305-f26b0857ea34 + k8s.io/client-go v0.0.0-20200304162518-f12177f0a965 k8s.io/component-base v0.0.0-20200304083046-fa4920973679 k8s.io/klog v1.0.0 k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c @@ -53,10 +53,10 @@ require ( 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 => k8s.io/api v0.0.0-20200304042242-0b68d4126df6 + k8s.io/api => k8s.io/api v0.0.0-20200304122248-037303d07dad k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200303201514-6584f51ae935 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200304084510-f80ad1dc527b - k8s.io/client-go => k8s.io/client-go v0.0.0-20200304082526-03ea99686473 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200304164305-f26b0857ea34 + k8s.io/client-go => k8s.io/client-go v0.0.0-20200304162518-f12177f0a965 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200214080538-dc8f3adce97c k8s.io/component-base => k8s.io/component-base v0.0.0-20200304083046-fa4920973679 k8s.io/metrics => k8s.io/metrics v0.0.0-20200304084343-4cf3f455bf52 diff --git a/go.sum b/go.sum index 6dfcc33c3..1b181205b 100644 --- a/go.sum +++ b/go.sum @@ -306,10 +306,10 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.0.0-20200304042242-0b68d4126df6/go.mod h1:EFuendCidCp9DUXAn3QXS0nWIaAgQYL8VaCqs8KTZBA= +k8s.io/api v0.0.0-20200304122248-037303d07dad/go.mod h1:EFuendCidCp9DUXAn3QXS0nWIaAgQYL8VaCqs8KTZBA= k8s.io/apimachinery v0.0.0-20200303201514-6584f51ae935/go.mod h1:5X8oEhnd931nEg6/Nkumo00nT6ZsCLp2h7Xwd7Ym6P4= -k8s.io/cli-runtime v0.0.0-20200304084510-f80ad1dc527b/go.mod h1:F2dcOgOo+pLviMgeWIN2xb5YFmY6hcZrDe1T1hSLqKk= -k8s.io/client-go v0.0.0-20200304082526-03ea99686473/go.mod h1:B//05jO7DLV6Eqwq0+uKe5FnBLn4/BpJ3RG7TA7a5Po= +k8s.io/cli-runtime v0.0.0-20200304164305-f26b0857ea34/go.mod h1:1K5QYF8MW308AOVMg+33nPuGTXZadAOYUrG0HCZQoHM= +k8s.io/client-go v0.0.0-20200304162518-f12177f0a965/go.mod h1:RazCmNV1L0cgQUsnGA9mex0sJU0CohwSXcmn9+Qq0zw= k8s.io/code-generator v0.0.0-20200214080538-dc8f3adce97c/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= k8s.io/component-base v0.0.0-20200304083046-fa4920973679/go.mod h1:lq0xL4uVP+juMbkkY6YH5AquFGmqvBg6FprvvwZcJak= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= diff --git a/pkg/cmd/clusterinfo/clusterinfo_dump.go b/pkg/cmd/clusterinfo/clusterinfo_dump.go index 0164041a8..4254405e3 100644 --- a/pkg/cmd/clusterinfo/clusterinfo_dump.go +++ b/pkg/cmd/clusterinfo/clusterinfo_dump.go @@ -300,10 +300,7 @@ func (o *ClusterInfoDumpOptions) Run() error { } dest := o.OutputDir - if len(dest) == 0 { - dest = "standard output" - } - if dest != "-" { + if len(dest) > 0 && dest != "-" { fmt.Fprintf(o.Out, "Cluster info dumped to %s\n", dest) } return nil