rename kube server binaries to kube-

apiserver becomes kube-apiserver
controller-manager -> kube-controller-manager
scheduler and proxy similarly.

Only thing I promise is that right now hack/build-go.sh and
build/release.sh exit with 0.  That's it.  Who knows if any of this
actually works....
This commit is contained in:
Eric Paris
2014-11-10 19:34:21 -05:00
parent ec51ec3e90
commit a99c3c7963
53 changed files with 236 additions and 236 deletions

View File

@@ -301,7 +301,7 @@ verify_from_container "${svc3_name}" "${svc3_ip}" "${svc3_port}" \
# Test 6: Restart the master, make sure portals come back.
#
echo "Restarting the master"
ssh-to-node "${master}" "sudo /etc/init.d/apiserver restart"
ssh-to-node "${master}" "sudo /etc/init.d/kube-apiserver restart"
sleep 5
echo "Verifying the portals from the host"
wait_for_service_up "${svc3_name}" "${svc3_ip}" "${svc3_port}" \

View File

@@ -20,11 +20,11 @@ readonly KUBE_GOPATH="${KUBE_OUTPUT}/go"
# The set of server targets that we are only building for Linux
readonly KUBE_SERVER_TARGETS=(
cmd/proxy
cmd/apiserver
cmd/controller-manager
cmd/kube-proxy
cmd/kube-apiserver
cmd/kube-controller-manager
cmd/kubelet
plugin/cmd/scheduler
plugin/cmd/kube-scheduler
)
readonly KUBE_SERVER_BINARIES=("${KUBE_SERVER_TARGETS[@]##*/}")

View File

@@ -84,8 +84,8 @@ esac
GO_OUT="${KUBE_ROOT}/_output/local/bin/${host_os}/${host_arch}"
APISERVER_LOG=/tmp/apiserver.log
"${GO_OUT}/apiserver" \
APISERVER_LOG=/tmp/kube-apiserver.log
"${GO_OUT}/kube-apiserver" \
-v=${LOG_LEVEL} \
--address="${API_HOST}" \
--port="${API_PORT}" \
@@ -94,11 +94,11 @@ APISERVER_LOG=/tmp/apiserver.log
--cors_allowed_origins="${API_CORS_ALLOWED_ORIGINS}" >"${APISERVER_LOG}" 2>&1 &
APISERVER_PID=$!
# Wait for apiserver to come up before launching the rest of the components.
# Wait for kube-apiserver to come up before launching the rest of the components.
kube::util::wait_for_url "http://${API_HOST}:${API_PORT}/api/v1beta1/pods" "apiserver: "
CTLRMGR_LOG=/tmp/controller-manager.log
"${GO_OUT}/controller-manager" \
CTLRMGR_LOG=/tmp/kube-controller-manager.log
"${GO_OUT}/kube-controller-manager" \
-v=${LOG_LEVEL} \
--machines="127.0.0.1" \
--master="${API_HOST}:${API_PORT}" >"${CTLRMGR_LOG}" 2>&1 &
@@ -114,13 +114,13 @@ KUBELET_LOG=/tmp/kubelet.log
KUBELET_PID=$!
PROXY_LOG=/tmp/kube-proxy.log
"${GO_OUT}/proxy" \
"${GO_OUT}/kube-proxy" \
-v=${LOG_LEVEL} \
--master="http://${API_HOST}:${API_PORT}" >"${PROXY_LOG}" 2>&1 &
PROXY_PID=$!
SCHEDULER_LOG=/tmp/k8s-scheduler.log
"${GO_OUT}/scheduler" \
SCHEDULER_LOG=/tmp/kube-scheduler.log
"${GO_OUT}/kube-scheduler" \
-v=${LOG_LEVEL} \
--master="http://${API_HOST}:${API_PORT}" >"${SCHEDULER_LOG}" 2>&1 &
SCHEDULER_PID=$!

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=$!