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
3775a50c
Unverified
Commit
3775a50c
authored
Sep 22, 2017
by
juanvallejo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add --selector flag support
parent
086bda60
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
148 additions
and
48 deletions
+148
-48
test-cmd-util.sh
hack/make-rules/test-cmd-util.sh
+39
-0
drain.go
pkg/kubectl/cmd/drain.go
+109
-48
No files found.
hack/make-rules/test-cmd-util.sh
View file @
3775a50c
...
@@ -4177,6 +4177,38 @@ run_certificates_tests() {
...
@@ -4177,6 +4177,38 @@ run_certificates_tests() {
set
+o errexit
set
+o errexit
}
}
run_cluster_management_tests
()
{
set
-o
nounset
set
-o
errexit
kube::log::status
"Testing cluster-management commands"
kube::test::get_object_assert nodes
"{{range.items}}{{
$id_field
}}:{{end}}"
'127.0.0.1:'
### kubectl drain command fails when both --selector and a node argument are given
# Pre-condition: node exists and contains label test=label
kubectl label node
"127.0.0.1"
"test=label"
kube::test::get_object_assert
"nodes 127.0.0.1"
'{{.metadata.labels.test}}'
'label'
response
=
$(
!
kubectl drain
"127.0.0.1"
--selector
test
=
label 2>&1
)
kube::test::if_has_string
"
${
response
}
"
'cannot specify both a node name'
### kubectl cordon command fails when no arguments are passed
# Pre-condition: node exists
response
=
$(
!
kubectl cordon 2>&1
)
kube::test::if_has_string
"
${
response
}
"
'error\: USAGE\: cordon NODE'
### kubectl cordon selects all nodes with an empty --selector=
# Pre-condition: node "127.0.0.1" is uncordoned
kubectl uncordon
"127.0.0.1"
response
=
$(
kubectl cordon
--selector
=
)
kube::test::if_has_string
"
${
response
}
"
'node "127.0.0.1" cordoned'
# Post-condition: node "127.0.0.1" is cordoned
kube::test::get_object_assert
"nodes 127.0.0.1"
"{{.spec.unschedulable}}"
'true'
set
+o nounset
set
+o errexit
}
run_plugins_tests
()
{
run_plugins_tests
()
{
set
-o
nounset
set
-o
nounset
set
-o
errexit
set
-o
errexit
...
@@ -4766,6 +4798,13 @@ runTests() {
...
@@ -4766,6 +4798,13 @@ runTests() {
record_command run_certificates_tests
record_command run_certificates_tests
fi
fi
######################
# Cluster Management #
######################
if
kube::test::if_supports_resource
"
${
nodes
}
"
;
then
record_command run_cluster_management_tests
fi
###########
###########
# Plugins #
# Plugins #
###########
###########
...
...
pkg/kubectl/cmd/drain.go
View file @
3775a50c
This diff is collapsed.
Click to expand it.
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