From 903787ab2c24688bac3039c5f4b7ad6d787d838c Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Wed, 25 Jan 2017 11:30:52 -0500 Subject: [PATCH] Tolerate existing kubernetes service in test-cmd.sh --- hack/make-rules/test-cmd-util.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hack/make-rules/test-cmd-util.sh b/hack/make-rules/test-cmd-util.sh index e1704b8bdb..c0ca931daf 100644 --- a/hack/make-rules/test-cmd-util.sh +++ b/hack/make-rules/test-cmd-util.sh @@ -2473,11 +2473,10 @@ runTests() { # Make sure "kubernetes" service exists. if kube::test::if_supports_resource "${services}" ; then - output_message=$(kubectl get "${kube_flags[@]}" svc) - if [[ ! $(echo "${output_message}" | grep "kubernetes") ]]; then - # Create kubernetes service - kubectl create "${kube_flags[@]}" -f hack/testdata/kubernetes-service.yaml - fi + # Attempt to create the kubernetes service, tolerating failure (since it might already exist) + kubectl create "${kube_flags[@]}" -f hack/testdata/kubernetes-service.yaml || true + # Require the service to exist (either we created it or the API server did) + kubectl get "${kube_flags[@]}" -f hack/testdata/kubernetes-service.yaml fi # Passing no arguments to create is an error