github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tolerate existing kubernetes service in test-cmd.sh

pull/6/head
Jordan Liggitt 2017-01-25 11:30:52 -05:00
parent a7f52b276f
commit 903787ab2c
No known key found for this signature in database
GPG Key ID: 24E7ADF9A3B42012
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hack/make-rules/test-cmd-util.sh
View File

@ -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