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
acabdcb9
Commit
acabdcb9
authored
Jun 01, 2018
by
Di Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
apply global flag "context" for kubectl config view
parent
5da925ad
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
72 additions
and
21 deletions
+72
-21
config_test.go
pkg/kubectl/cmd/config/config_test.go
+2
-2
view.go
pkg/kubectl/cmd/config/view.go
+5
-0
view_test.go
pkg/kubectl/cmd/config/view_test.go
+65
-19
No files found.
pkg/kubectl/cmd/config/config_test.go
View file @
acabdcb9
...
...
@@ -865,12 +865,12 @@ func testConfigCommand(args []string, startingConfig clientcmdapi.Config, t *tes
streams
,
_
,
buf
,
_
:=
genericclioptions
.
NewTestIOStreams
()
cmd
:=
NewCmdConfig
(
cmdutil
.
NewFactory
(
genericclioptions
.
NewTestConfigFlags
()),
clientcmd
.
NewDefaultPathOptions
(),
streams
)
// "context" is a global flag, inherited from base kubectl command in the real world
cmd
.
PersistentFlags
()
.
String
(
"context"
,
""
,
"The name of the kubeconfig context to use"
)
cmd
.
SetArgs
(
argsToUse
)
cmd
.
Execute
()
// outBytes, _ := ioutil.ReadFile(fakeKubeFile.Name())
config
:=
clientcmd
.
GetConfigFromFileOrDie
(
fakeKubeFile
.
Name
())
return
buf
.
String
(),
*
config
}
...
...
pkg/kubectl/cmd/config/view.go
View file @
acabdcb9
...
...
@@ -43,6 +43,7 @@ type ViewOptions struct {
Minify
bool
RawByteData
bool
Context
string
OutputFormat
string
genericclioptions
.
IOStreams
...
...
@@ -110,6 +111,7 @@ func (o *ViewOptions) Complete(cmd *cobra.Command) error {
return
err
}
o
.
PrintObject
=
printer
.
PrintObj
o
.
Context
=
cmdutil
.
GetFlagString
(
cmd
,
"context"
)
return
nil
}
...
...
@@ -129,6 +131,9 @@ func (o ViewOptions) Run() error {
}
if
o
.
Minify
{
if
len
(
o
.
Context
)
>
0
{
config
.
CurrentContext
=
o
.
Context
}
if
err
:=
clientcmdapi
.
MinifyConfig
(
config
);
err
!=
nil
{
return
err
}
...
...
pkg/kubectl/cmd/config/view_test.go
View file @
acabdcb9
...
...
@@ -43,19 +43,19 @@ func TestViewCluster(t *testing.T) {
"my-cluster"
:
{
Server
:
"https://192.168.0.1:3434"
},
},
Contexts
:
map
[
string
]
*
clientcmdapi
.
Context
{
"minikube"
:
{
AuthInfo
:
"minikube"
,
Cluster
:
"minikube"
},
"my-cluser"
:
{
AuthInfo
:
"mu-cluster"
,
Cluster
:
"my-cluster"
},
"minikube"
:
{
AuthInfo
:
"minikube"
,
Cluster
:
"minikube"
},
"my-clus
t
er"
:
{
AuthInfo
:
"mu-cluster"
,
Cluster
:
"my-cluster"
},
},
CurrentContext
:
"minikube"
,
AuthInfos
:
map
[
string
]
*
clientcmdapi
.
AuthInfo
{
"minikube"
:
{
Token
:
"minikube-token"
},
"m
y-clus
er"
:
{
Token
:
"minikube-token"
},
"minikube"
:
{
Token
:
"minikube-token"
},
"m
u-clust
er"
:
{
Token
:
"minikube-token"
},
},
}
test
:=
viewClusterTest
{
description
:
"Testing for kubectl config view"
,
config
:
conf
,
flags
:
[]
string
{},
expected
:
`apiVersion: v1
clusters:
- cluster:
...
...
@@ -72,7 +72,7 @@ contexts:
- context:
cluster: my-cluster
user: mu-cluster
name: my-cluser
name: my-clus
t
er
current-context: minikube
kind: Config
preferences: {}
...
...
@@ -80,10 +80,13 @@ users:
- name: minikube
user:
token: minikube-token
- name: m
y-clus
er
- name: m
u-clust
er
user:
token: minikube-token`
+
"
\n
"
}
token: minikube-token`
+
"
\n
"
,
}
test
.
run
(
t
)
}
func
TestViewClusterMinify
(
t
*
testing
.
T
)
{
...
...
@@ -95,20 +98,27 @@ func TestViewClusterMinify(t *testing.T) {
"my-cluster"
:
{
Server
:
"https://192.168.0.1:3434"
},
},
Contexts
:
map
[
string
]
*
clientcmdapi
.
Context
{
"minikube"
:
{
AuthInfo
:
"minikube"
,
Cluster
:
"minikube"
},
"my-cluser"
:
{
AuthInfo
:
"mu-cluster"
,
Cluster
:
"my-cluster"
},
"minikube"
:
{
AuthInfo
:
"minikube"
,
Cluster
:
"minikube"
},
"my-clus
t
er"
:
{
AuthInfo
:
"mu-cluster"
,
Cluster
:
"my-cluster"
},
},
CurrentContext
:
"minikube"
,
AuthInfos
:
map
[
string
]
*
clientcmdapi
.
AuthInfo
{
"minikube"
:
{
Token
:
"minikube-token"
},
"m
y-clus
er"
:
{
Token
:
"minikube-token"
},
"minikube"
:
{
Token
:
"minikube-token"
},
"m
u-clust
er"
:
{
Token
:
"minikube-token"
},
},
}
test
:=
viewClusterTest
{
description
:
"Testing for kubectl config view --minify=true"
,
config
:
conf
,
flags
:
[]
string
{
"--minify=true"
},
expected
:
`apiVersion: v1
testCases
:=
[]
struct
{
description
string
config
clientcmdapi
.
Config
flags
[]
string
expected
string
}{
{
description
:
"Testing for kubectl config view --minify=true"
,
config
:
conf
,
flags
:
[]
string
{
"--minify=true"
},
expected
:
`apiVersion: v1
clusters:
- cluster:
server: https://192.168.99.100:8443
...
...
@@ -124,8 +134,41 @@ preferences: {}
users:
- name: minikube
user:
token: minikube-token`
+
"
\n
"
}
test
.
run
(
t
)
token: minikube-token`
+
"
\n
"
,
},
{
description
:
"Testing for kubectl config view --minify=true --context=my-cluster"
,
config
:
conf
,
flags
:
[]
string
{
"--minify=true"
,
"--context=my-cluster"
},
expected
:
`apiVersion: v1
clusters:
- cluster:
server: https://192.168.0.1:3434
name: my-cluster
contexts:
- context:
cluster: my-cluster
user: mu-cluster
name: my-cluster
current-context: my-cluster
kind: Config
preferences: {}
users:
- name: mu-cluster
user:
token: minikube-token`
+
"
\n
"
,
},
}
for
_
,
test
:=
range
testCases
{
cmdTest
:=
viewClusterTest
{
description
:
test
.
description
,
config
:
test
.
config
,
flags
:
test
.
flags
,
expected
:
test
.
expected
,
}
cmdTest
.
run
(
t
)
}
}
func
(
test
viewClusterTest
)
run
(
t
*
testing
.
T
)
{
...
...
@@ -143,7 +186,10 @@ func (test viewClusterTest) run(t *testing.T) {
pathOptions
.
EnvVar
=
""
streams
,
_
,
buf
,
_
:=
genericclioptions
.
NewTestIOStreams
()
cmd
:=
NewCmdConfigView
(
cmdutil
.
NewFactory
(
genericclioptions
.
NewTestConfigFlags
()),
streams
,
pathOptions
)
// "context" is a global flag, inherited from base kubectl command in the real world
cmd
.
Flags
()
.
String
(
"context"
,
""
,
"The name of the kubeconfig context to use"
)
cmd
.
Flags
()
.
Parse
(
test
.
flags
)
if
err
:=
cmd
.
Execute
();
err
!=
nil
{
t
.
Fatalf
(
"unexpected error executing command: %v,kubectl config view flags: %v"
,
err
,
test
.
flags
)
}
...
...
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