github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-12 12:48:51 +00:00
Code Issues Projects Releases Wiki Activity

Integration tests should use 127.0.0.1 consistently

Browse Source
This commit is contained in:
Clayton Coleman
2015-02-09 14:30:05 -05:00
parent a84e94574f
commit 4369e31b9d
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hack/lib/etcd.sh
View File

@@ -40,12 +40,12 @@ kube::etcd::start() {
# Start etcd
ETCD_DIR=$(mktemp -d -t test-etcd.XXXXXX)
kube::log::usage "etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null"
etcd -data-dir ${ETCD_DIR} -addr ${host}:${port} >/dev/null 2>/dev/null &
etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null &
ETCD_PID=$!
echo "Waiting for etcd to come up."
kube::util::wait_for_url "http://${testhost}:${port}/v2/machines" "etcd: " 0.25 80
curl -X PUT "http://${testhost}:${port}/v2/keys/_test"
kube::util::wait_for_url "http://${host}:${port}/v2/machines" "etcd: " 0.25 80
curl -X PUT "http://${host}:${port}/v2/keys/_test"
}
kube::etcd::cleanup() {

2
hack/local-up-cluster.sh
View File

@@ -93,7 +93,7 @@ sudo "${GO_OUT}/kube-apiserver" \
--address="${API_HOST}" \
--port="${API_PORT}" \
--runtime_config=api/v1beta3 \
--etcd_servers="http://localhost:4001" \
--etcd_servers="http://127.0.0.1:4001" \
--portal_net="10.0.0.0/24" \
--cors_allowed_origins="${API_CORS_ALLOWED_ORIGINS}" >"${APISERVER_LOG}" 2>&1 &
APISERVER_PID=$!