github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-08 20:50:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'rename-to-kube' of https://github.com/eparis/kubernetes into eparis-rename-to-kube

Browse Source 
* 'rename-to-kube' of https://github.com/eparis/kubernetes:
  rename kube server binaries to kube-

Conflicts:
	docs/salt.md
This commit is contained in:
Joe Beda
2014-11-17 09:52:10 -08:00
parent 5fc485f0bc a99c3c7963
commit 66d287f7e4
53 changed files with 235 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hack/test-cmd.sh
View File

@@ -63,9 +63,9 @@ KUBELET_PID=$!
kube::util::wait_for_url "http://127.0.0.1:${KUBELET_PORT}/healthz" "kubelet: "
# Start apiserver
kube::log::status "Starting apiserver"
"${KUBE_OUTPUT_HOSTBIN}/apiserver" \
# Start kube-apiserver
kube::log::status "Starting kube-apiserver"
"${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \
--address="127.0.0.1" \
--public_address_override="127.0.0.1" \
--port="${API_PORT}" \
@@ -88,7 +88,7 @@ kube_flags=(
# Start controller manager
kube::log::status "Starting CONTROLLER-MANAGER"
"${KUBE_OUTPUT_HOSTBIN}/controller-manager" \
"${KUBE_OUTPUT_HOSTBIN}/kube-controller-manager" \
--machines="127.0.0.1" \
--master="127.0.0.1:${API_PORT}" 1>&2 &
CTLRMGR_PID=$!
@@ -130,6 +130,6 @@ kube::log::status "TEST PASSED"
# Start proxy
#PROXY_LOG=/tmp/kube-proxy.log
#${KUBE_OUTPUT_HOSTBIN}/proxy \
#${KUBE_OUTPUT_HOSTBIN}/kube-proxy \
# --etcd_servers="http://127.0.0.1:${ETCD_PORT}" 1>&2 &
#PROXY_PID=$!