From 4752d1a181e7fcaad0a5c14c2c966c86d79fd07d Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Sun, 24 Apr 2016 14:54:22 -0400 Subject: [PATCH] Allow test-cmd to run on non-Linux OS --- hack/test-cmd.sh | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh index 3ee6cf14af4..bda01f8df9d 100755 --- a/hack/test-cmd.sh +++ b/hack/test-cmd.sh @@ -148,6 +148,9 @@ HOME="${KUBE_TEMP}" kube::log::status "Running kubectl with no options" "${KUBE_OUTPUT_HOSTBIN}/kubectl" +# Only run kubelet on platforms it supports +if [[ "$(go env GOHOSTOS)" == "linux" ]]; then + kube::log::status "Starting kubelet in masterless mode" "${KUBE_OUTPUT_HOSTBIN}/kubelet" \ --really-crash-for-testing=true \ @@ -177,6 +180,8 @@ KUBELET_PID=$! kube::util::wait_for_url "http://127.0.0.1:${KUBELET_HEALTHZ_PORT}/healthz" "kubelet" +fi + # Start kube-apiserver kube::log::status "Starting kube-apiserver" @@ -206,7 +211,26 @@ kube::log::status "Starting controller-manager" CTLRMGR_PID=$! kube::util::wait_for_url "http://127.0.0.1:${CTLRMGR_PORT}/healthz" "controller-manager" -kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/api/v1/nodes/127.0.0.1" "apiserver(nodes)" + +if [[ "$(go env GOHOSTOS)" == "linux" ]]; then + kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/api/v1/nodes/127.0.0.1" "apiserver(nodes)" +else + # create a fake node + kubectl create -f - -s "http://127.0.0.1:${API_PORT}" << __EOF__ +{ + "kind": "Node", + "apiVersion": "v1", + "metadata": { + "name": "127.0.0.1" + }, + "status": { + "capacity": { + "memory": "1Gi" + } + } +} +__EOF__ +fi # Expose kubectl directly for readability PATH="${KUBE_OUTPUT_HOSTBIN}":$PATH