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
0ba41e72
Commit
0ba41e72
authored
Jun 19, 2017
by
xilabao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix parse resource in setting selector
parent
a57c33bd
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
test-cmd-util.sh
hack/make-rules/test-cmd-util.sh
+7
-0
set_selector.go
pkg/kubectl/cmd/set/set_selector.go
+4
-2
No files found.
hack/make-rules/test-cmd-util.sh
View file @
0ba41e72
...
@@ -2435,6 +2435,9 @@ run_service_tests() {
...
@@ -2435,6 +2435,9 @@ run_service_tests() {
# prove role=master
# prove role=master
kube::test::get_object_assert
'services redis-master'
"{{range
$service_selector_field
}}{{.}}:{{end}}"
"redis:master:backend:"
kube::test::get_object_assert
'services redis-master'
"{{range
$service_selector_field
}}{{.}}:{{end}}"
"redis:master:backend:"
# Set selector of a local file without talking to the server
kubectl
set
selector
-f
examples/guestbook/redis-master-service.yaml
role
=
padawan
--local
-o
yaml
"
${
kube_flags
[@]
}
"
!
kubectl
set
selector
-f
examples/guestbook/redis-master-service.yaml
role
=
padawan
--dry-run
-o
yaml
"
${
kube_flags
[@]
}
"
# Set command to change the selector.
# Set command to change the selector.
kubectl
set
selector
-f
examples/guestbook/redis-master-service.yaml
role
=
padawan
kubectl
set
selector
-f
examples/guestbook/redis-master-service.yaml
role
=
padawan
# prove role=padawan
# prove role=padawan
...
@@ -2443,6 +2446,10 @@ run_service_tests() {
...
@@ -2443,6 +2446,10 @@ run_service_tests() {
kubectl
set
selector
-f
examples/guestbook/redis-master-service.yaml
app
=
redis,role
=
master,tier
=
backend
kubectl
set
selector
-f
examples/guestbook/redis-master-service.yaml
app
=
redis,role
=
master,tier
=
backend
# prove role=master
# prove role=master
kube::test::get_object_assert
'services redis-master'
"{{range
$service_selector_field
}}{{.}}:{{end}}"
"redis:master:backend:"
kube::test::get_object_assert
'services redis-master'
"{{range
$service_selector_field
}}{{.}}:{{end}}"
"redis:master:backend:"
# Show dry-run works on running selector
kubectl
set
selector services redis-master
role
=
padawan
--dry-run
-o
yaml
"
${
kube_flags
[@]
}
"
!
kubectl
set
selector services redis-master
role
=
padawan
--local
-o
yaml
"
${
kube_flags
[@]
}
"
kube::test::get_object_assert
'services redis-master'
"{{range
$service_selector_field
}}{{.}}:{{end}}"
"redis:master:backend:"
### Dump current redis-master service
### Dump current redis-master service
output_service
=
$(
kubectl get service redis-master
-o
json
--output-version
=
v1
"
${
kube_flags
[@]
}
"
)
output_service
=
$(
kubectl get service redis-master
-o
json
--output-version
=
v1
"
${
kube_flags
[@]
}
"
)
...
...
pkg/kubectl/cmd/set/set_selector.go
View file @
0ba41e72
...
@@ -116,6 +116,10 @@ func (o *SelectorOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args [
...
@@ -116,6 +116,10 @@ func (o *SelectorOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args [
mapper
,
_
:=
f
.
Object
()
mapper
,
_
:=
f
.
Object
()
o
.
mapper
=
mapper
o
.
mapper
=
mapper
o
.
encoder
=
f
.
JSONEncoder
()
o
.
encoder
=
f
.
JSONEncoder
()
o
.
resources
,
o
.
selector
,
err
=
getResourcesAndSelector
(
args
)
if
err
!=
nil
{
return
err
}
o
.
builder
=
f
.
NewBuilder
(
!
o
.
local
)
.
o
.
builder
=
f
.
NewBuilder
(
!
o
.
local
)
.
ContinueOnError
()
.
ContinueOnError
()
.
...
@@ -135,8 +139,6 @@ func (o *SelectorOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args [
...
@@ -135,8 +139,6 @@ func (o *SelectorOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args [
o
.
ClientForMapping
=
func
(
mapping
*
meta
.
RESTMapping
)
(
resource
.
RESTClient
,
error
)
{
o
.
ClientForMapping
=
func
(
mapping
*
meta
.
RESTMapping
)
(
resource
.
RESTClient
,
error
)
{
return
f
.
ClientForMapping
(
mapping
)
return
f
.
ClientForMapping
(
mapping
)
}
}
o
.
resources
,
o
.
selector
,
err
=
getResourcesAndSelector
(
args
)
return
err
return
err
}
}
...
...
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