github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-05 19:21:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9027 from jlowdermilk/kubectl-deprecate-minion

Browse Source 
Stop supporting the minion alias for nodes in kubectl
This commit is contained in:
Eric Tune
2015-06-01 10:26:51 -07:00
parent 936c6842e0 0c44be833d
commit 1f526a5f89
5 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
hack/test-cmd.sh
View File

@@ -122,14 +122,14 @@ for version in "${kube_api_versions[@]}"; do
-s "http://127.0.0.1:${API_PORT}"
--match-server-version
)
[ "$(kubectl get minions -t '{{ .apiVersion }}' "${kube_flags[@]}")" == "v1beta3" ]
[ "$(kubectl get nodes -t '{{ .apiVersion }}' "${kube_flags[@]}")" == "v1beta3" ]
else
kube_flags=(
-s "http://127.0.0.1:${API_PORT}"
--match-server-version
--api-version="${version}"
)
[ "$(kubectl get minions -t '{{ .apiVersion }}' "${kube_flags[@]}")" == "${version}" ]
[ "$(kubectl get nodes -t '{{ .apiVersion }}' "${kube_flags[@]}")" == "${version}" ]
fi
id_field=".metadata.name"
labels_field=".metadata.labels"
@@ -623,18 +623,17 @@ __EOF__
###########
# Minions #
# Nodes #
###########
if [[ "${version}" = "v1beta1" ]] || [[ "${version}" = "v1beta2" ]]; then
kube::log::status "Testing kubectl(${version}:minions)"
kube::log::status "Testing kubectl(${version}:nodes)"
kube::test::get_object_assert minions "{{range.items}}{{$id_field}}:{{end}}" '127.0.0.1:'
kube::test::get_object_assert nodes "{{range.items}}{{$id_field}}:{{end}}" '127.0.0.1:'
# TODO: I should be a MinionList instead of List
kube::test::get_object_assert minions '{{.kind}}' 'List'
kube::test::get_object_assert nodes '{{.kind}}' 'List'
kube::test::describe_object_assert minions "127.0.0.1" "Name:" "Conditions:" "Addresses:" "Capacity:" "Pods:"
kube::test::describe_object_assert nodes "127.0.0.1" "Name:" "Conditions:" "Addresses:" "Capacity:" "Pods:"
fi