github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-06 11:42:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27902 from caesarxuchao/fix-test-cmd

Browse Source 
Automatic merge from submit-queue

fix test-cmd multi-resource test

See inline descriptions.
This commit is contained in:
k8s-merge-robot
2016-06-25 14:47:30 -07:00
committed by GitHub
parent 1effc5af91 27f4eca5b3
commit 7d3d784655
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hack/test-cmd.sh
View File

@@ -2059,7 +2059,7 @@ __EOF__
fi
kubectl describe -f "${file}" "${kube_flags[@]}"
# Command
kubectl replace -f $replace_file --force "${kube_flags[@]}"
kubectl replace -f $replace_file --force --cascade "${kube_flags[@]}"
# Post-condition: mock service (and mock2) and mock rc (and mock2) are replaced
if [ "$has_svc" = true ]; then
kube::test::get_object_assert 'services mock' "{{${labels_field}.status}}" 'replaced'