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

Merge pull request #38191 from sttts/sttts-move-master-options

Browse Source 
Automatic merge from submit-queue

Move non-generic apiserver code out of the generic packages
This commit is contained in:
Kubernetes Submit Queue
2016-12-17 01:25:45 -08:00
committed by GitHub
parent a4577e70ab 7adaac79ca
commit 5b2823adb9
31 changed files with 219 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hack/update-federation-openapi-spec.sh
View File

@@ -61,8 +61,7 @@ kube::log::status "Starting federation-apiserver"
--etcd-servers="http://${ETCD_HOST}:${ETCD_PORT}" \
--advertise-address="10.10.10.10" \
--cert-dir="${TMP_DIR}/certs" \
--token-auth-file=$TMP_DIR/tokenauth.csv \
--service-cluster-ip-range="10.0.0.0/24" >/tmp/openapi-federation-api-server.log 2>&1 &
--token-auth-file=$TMP_DIR/tokenauth.csv >/tmp/openapi-federation-api-server.log 2>&1 &
APISERVER_PID=$!
kube::util::wait_for_url "${API_HOST}:${API_PORT}/" "apiserver: "