From 27f4eca5b315d5db7c35d888a4004065ef0e6199 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Wed, 22 Jun 2016 14:57:26 -0700 Subject: [PATCH] fix test-cmd multi-resource test --- hack/test-cmd.sh | 2 +- hack/testdata/multi-resource-yaml-modify.yaml | 2 ++ hack/testdata/multi-resource-yaml.yaml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh index 78ae3843d05..6e33187611c 100755 --- a/hack/test-cmd.sh +++ b/hack/test-cmd.sh @@ -2031,7 +2031,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' diff --git a/hack/testdata/multi-resource-yaml-modify.yaml b/hack/testdata/multi-resource-yaml-modify.yaml index c5e9b32f958..86fe824197b 100644 --- a/hack/testdata/multi-resource-yaml-modify.yaml +++ b/hack/testdata/multi-resource-yaml-modify.yaml @@ -19,6 +19,8 @@ metadata: name: mock spec: replicas: 1 + selector: + app: mock template: metadata: labels: diff --git a/hack/testdata/multi-resource-yaml.yaml b/hack/testdata/multi-resource-yaml.yaml index 760fdefb09f..bef9e88b2c2 100644 --- a/hack/testdata/multi-resource-yaml.yaml +++ b/hack/testdata/multi-resource-yaml.yaml @@ -18,6 +18,8 @@ metadata: name: mock spec: replicas: 1 + selector: + app: mock template: metadata: labels: