Skip to content

K
k3s
Commit 8d4c79fc authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #45365 from shashidharatd/kubectl-tests

Automatic merge from submit-queue federation: Fix federated service deletion in kubectl tests A copy-paste mistake happened and was overlooked in PR #45265. fixing it now. **Release note**: ``` NONE ``` cc @nikhiljindal @kubernetes/sig-federation-bugs
parents ca520e34 f0853396
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
hack/make-rules/test-cmd-util.sh
View file @ 8d4c79fc
...@@ -2063,7 +2063,7 @@ __EOF__ ...@@ -2063,7 +2063,7 @@ __EOF__
kubectl delete service redis-master "${kube_flags[@]}" kubectl delete service redis-master "${kube_flags[@]}"
kubectl delete service "service-v1-test" "${kube_flags[@]}" kubectl delete service "service-v1-test" "${kube_flags[@]}"
if [[ "${WAIT_FOR_DELETION:-}" == "true" ]]; then if [[ "${WAIT_FOR_DELETION:-}" == "true" ]]; then
kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:' kube::test::wait_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:'
fi fi
# Post-condition: Only the default kubernetes services exist # Post-condition: Only the default kubernetes services exist
kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:' kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:'
...@@ -2089,7 +2089,7 @@ __EOF__ ...@@ -2089,7 +2089,7 @@ __EOF__
# Command # Command
kubectl delete services redis-master redis-slave "${kube_flags[@]}" # delete multiple services at once kubectl delete services redis-master redis-slave "${kube_flags[@]}" # delete multiple services at once
if [[ "${WAIT_FOR_DELETION:-}" == "true" ]]; then if [[ "${WAIT_FOR_DELETION:-}" == "true" ]]; then
kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:' kube::test::wait_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:'
fi fi
# Post-condition: Only the default kubernetes services exist # Post-condition: Only the default kubernetes services exist
kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:' kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment