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

Automatic merge from submit-queue

fix test-cmd multi-resource test

See inline descriptions.
pull/6/head
k8s-merge-robot 2016-06-25 14:47:30 -07:00 committed by GitHub
commit 7d3d784655
3 changed files with 5 additions and 1 deletions

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'

View File

@ -19,6 +19,8 @@ metadata:
name: mock
spec:
replicas: 1
selector:
app: mock
template:
metadata:
labels:

View File

@ -18,6 +18,8 @@ metadata:
name: mock
spec:
replicas: 1
selector:
app: mock
template:
metadata:
labels: