Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
4efb0208
Commit
4efb0208
authored
Nov 06, 2018
by
David Eads
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kubectl version should print just client information in the absence of kubeconfig
parent
8dcdec0a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
BUILD
pkg/kubectl/cmd/version/BUILD
+1
-0
version.go
pkg/kubectl/cmd/version/version.go
+5
-2
No files found.
pkg/kubectl/cmd/version/BUILD
View file @
4efb0208
...
...
@@ -13,6 +13,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/version:go_default_library",
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
"//staging/src/k8s.io/client-go/discovery:go_default_library",
"//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
"//vendor/github.com/ghodss/yaml:go_default_library",
"//vendor/github.com/spf13/cobra:go_default_library",
],
...
...
pkg/kubectl/cmd/version/version.go
View file @
4efb0208
...
...
@@ -27,6 +27,7 @@ import (
apimachineryversion
"k8s.io/apimachinery/pkg/version"
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/discovery"
"k8s.io/client-go/tools/clientcmd"
cmdutil
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
...
...
@@ -83,7 +84,9 @@ func NewCmdVersion(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *co
func
(
o
*
VersionOptions
)
Complete
(
f
cmdutil
.
Factory
,
cmd
*
cobra
.
Command
)
error
{
var
err
error
o
.
discoveryClient
,
err
=
f
.
ToDiscoveryClient
()
if
err
!=
nil
{
// if we had an empty rest.Config, continue and just print out client information.
// if we had an error other than being unable to build a rest.Config, fail.
if
err
!=
nil
&&
!
clientcmd
.
IsEmptyConfig
(
err
)
{
return
err
}
return
nil
...
...
@@ -107,7 +110,7 @@ func (o *VersionOptions) Run() error {
clientVersion
:=
version
.
Get
()
versionInfo
.
ClientVersion
=
&
clientVersion
if
!
o
.
ClientOnly
{
if
!
o
.
ClientOnly
&&
o
.
discoveryClient
!=
nil
{
// Always request fresh data from the server
o
.
discoveryClient
.
Invalidate
()
serverVersion
,
serverErr
=
o
.
discoveryClient
.
ServerVersion
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment