github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix shellcheck failures of hack/update-openapi-spec.sh

k3s-v1.15.3
SataQiu 2019-04-16 03:40:56 +08:00
parent c09cfb7178
commit 142e458a97
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.shellcheck_failures
View File

@ -45,7 +45,6 @@
./hack/update-generated-kms-dockerized.sh ./hack/update-generated-kms-dockerized.sh
./hack/update-generated-protobuf-dockerized.sh ./hack/update-generated-protobuf-dockerized.sh
./hack/update-generated-runtime-dockerized.sh ./hack/update-generated-runtime-dockerized.sh
./hack/update-openapi-spec.sh
./hack/update-vendor.sh ./hack/update-vendor.sh
./hack/verify-api-groups.sh ./hack/verify-api-groups.sh
./hack/verify-boilerplate.sh ./hack/verify-boilerplate.sh

10
hack/update-openapi-spec.sh
View File

@ -21,7 +21,7 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
OPENAPI_ROOT_DIR="${KUBE_ROOT}/api/openapi-spec" OPENAPI_ROOT_DIR="${KUBE_ROOT}/api/openapi-spec"
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
@ -33,8 +33,8 @@ make -C "${KUBE_ROOT}" WHAT=cmd/kube-apiserver
function cleanup() function cleanup()
{ {
if [[ -n ${APISERVER_PID-} ]]; then if [[ -n ${APISERVER_PID-} ]]; then
kill ${APISERVER_PID} 1>&2 2>/dev/null kill "${APISERVER_PID}" 1>&2 2>/dev/null
wait ${APISERVER_PID} || true wait "${APISERVER_PID}" || true
fi fi
unset APISERVER_PID unset APISERVER_PID
@ -56,7 +56,7 @@ API_LOGFILE=${API_LOGFILE:-/tmp/openapi-api-server.log}
kube::etcd::start kube::etcd::start
echo "dummy_token,admin,admin" > ${TMP_DIR}/tokenauth.csv echo "dummy_token,admin,admin" > "${TMP_DIR}/tokenauth.csv"
# Start kube-apiserver # Start kube-apiserver
kube::log::status "Starting kube-apiserver" kube::log::status "Starting kube-apiserver"
@ -82,7 +82,7 @@ if ! kube::util::wait_for_url "${API_HOST}:${API_PORT}/healthz" "apiserver: "; t
exit 1 exit 1
fi fi
kube::log::status "Updating " ${OPENAPI_ROOT_DIR} kube::log::status "Updating " "${OPENAPI_ROOT_DIR}"
curl -w "\n" -fs "${API_HOST}:${API_PORT}/openapi/v2" | jq -S . > "${OPENAPI_ROOT_DIR}/swagger.json" curl -w "\n" -fs "${API_HOST}:${API_PORT}/openapi/v2" | jq -S . > "${OPENAPI_ROOT_DIR}/swagger.json"