github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Handle sudo cleanly with tmp dir in generation

Browse Source 
Also ensure meta/v1 swagger docs are generated.
This commit is contained in:
Clayton Coleman 2016-12-05 15:48:05 -05:00
parent 3c72ee2189
commit 81adce5a3a
No known key found for this signature in database
GPG Key ID: 3D16906B4F1C5CB3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/update-federation-swagger-spec.sh
View File

@ -49,6 +49,7 @@ trap cleanup EXIT SIGINT
kube::golang::setup_env kube::golang::setup_env
TMP_DIR=$(mktemp -d /tmp/update-federation-swagger-spec.XXXX)
ETCD_HOST=${ETCD_HOST:-127.0.0.1} ETCD_HOST=${ETCD_HOST:-127.0.0.1}
ETCD_PORT=${ETCD_PORT:-2379} ETCD_PORT=${ETCD_PORT:-2379}
API_PORT=${API_PORT:-8050} API_PORT=${API_PORT:-8050}
@ -58,12 +59,13 @@ kube::etcd::start
# Start federation-apiserver # Start federation-apiserver
kube::log::status "Starting federation-apiserver" kube::log::status "Starting federation-apiserver"
sudo -E "${KUBE_OUTPUT_HOSTBIN}/hyperkube" federation-apiserver \ "${KUBE_OUTPUT_HOSTBIN}/hyperkube" federation-apiserver \
--insecure-bind-address="${API_HOST}" \ --insecure-bind-address="${API_HOST}" \
--bind-address="${API_HOST}" \ --bind-address="${API_HOST}" \
--insecure-port="${API_PORT}" \ --insecure-port="${API_PORT}" \
--etcd-servers="http://${ETCD_HOST}:${ETCD_PORT}" \ --etcd-servers="http://${ETCD_HOST}:${ETCD_PORT}" \
--advertise-address="10.10.10.10" \ --advertise-address="10.10.10.10" \
--cert-dir="${TMP_DIR}/certs" \
--service-cluster-ip-range="10.0.0.0/24" >/tmp/swagger-federation-api-server.log 2>&1 & --service-cluster-ip-range="10.0.0.0/24" >/tmp/swagger-federation-api-server.log 2>&1 &
APISERVER_PID=$! APISERVER_PID=$!

2
hack/update-generated-swagger-docs.sh
View File

@ -28,7 +28,7 @@ source "${KUBE_ROOT}/hack/lib/swagger.sh"
kube::golang::setup_env kube::golang::setup_env
GROUP_VERSIONS=(${KUBE_AVAILABLE_GROUP_VERSIONS}) GROUP_VERSIONS=(meta/v1 ${KUBE_AVAILABLE_GROUP_VERSIONS})
# To avoid compile errors, remove the currently existing files. # To avoid compile errors, remove the currently existing files.
for group_version in "${GROUP_VERSIONS[@]}"; do for group_version in "${GROUP_VERSIONS[@]}"; do