mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-11-04 07:49:35 +00:00
31511f9e24
Automatic merge from submit-queue (batch tested with PRs 63315, 63383, 63318, 63439). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Re-enable lease reconciler, fix shutdown race Fixes #63378 Fixes #57617 * Fixes the openapi script to wait for the apiserver on shutdown (like all the other scripts do) * Fixes the apiserver shutdown to not hang forever if the kubernetes service reconciler cannot persist to etcd * Readds https://github.com/kubernetes/kubernetes/pull/58474 to make the default the lease reconciler ```release-note kube-apiserver: the default `--endpoint-reconciler-type` is now `lease`. The `master-count` endpoint reconciler type is deprecated and will be removed in 1.13. ```
86 lines
2.3 KiB
Bash
Executable File
86 lines
2.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
# Copyright 2016 The Kubernetes Authors.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
# Script to fetch latest openapi spec.
|
|
# Puts the updated spec at api/openapi-spec/
|
|
|
|
set -o errexit
|
|
set -o nounset
|
|
set -o pipefail
|
|
|
|
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
|
|
OPENAPI_ROOT_DIR="${KUBE_ROOT}/api/openapi-spec"
|
|
source "${KUBE_ROOT}/hack/lib/init.sh"
|
|
|
|
kube::golang::setup_env
|
|
|
|
make -C "${KUBE_ROOT}" WHAT=cmd/kube-apiserver
|
|
|
|
function cleanup()
|
|
{
|
|
if [[ -n ${APISERVER_PID-} ]]; then
|
|
kill ${APISERVER_PID} 1>&2 2>/dev/null
|
|
wait ${APISERVER_PID} || true
|
|
fi
|
|
unset APISERVER_PID
|
|
|
|
kube::etcd::cleanup
|
|
|
|
kube::log::status "Clean up complete"
|
|
}
|
|
|
|
trap cleanup EXIT SIGINT
|
|
|
|
kube::golang::setup_env
|
|
|
|
apiserver=$(kube::util::find-binary "kube-apiserver")
|
|
|
|
TMP_DIR=$(mktemp -d /tmp/update-openapi-spec.XXXX)
|
|
ETCD_HOST=${ETCD_HOST:-127.0.0.1}
|
|
ETCD_PORT=${ETCD_PORT:-2379}
|
|
API_PORT=${API_PORT:-8050}
|
|
API_HOST=${API_HOST:-127.0.0.1}
|
|
|
|
kube::etcd::start
|
|
|
|
echo "dummy_token,admin,admin" > $TMP_DIR/tokenauth.csv
|
|
|
|
# Start kube-apiserver
|
|
kube::log::status "Starting kube-apiserver"
|
|
"${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \
|
|
--insecure-bind-address="${API_HOST}" \
|
|
--bind-address="${API_HOST}" \
|
|
--insecure-port="${API_PORT}" \
|
|
--etcd-servers="http://${ETCD_HOST}:${ETCD_PORT}" \
|
|
--advertise-address="10.10.10.10" \
|
|
--cert-dir="${TMP_DIR}/certs" \
|
|
--runtime-config="api/all=true" \
|
|
--token-auth-file=$TMP_DIR/tokenauth.csv \
|
|
--logtostderr \
|
|
--v=2 \
|
|
--service-cluster-ip-range="10.0.0.0/24" >/tmp/openapi-api-server.log 2>&1 &
|
|
APISERVER_PID=$!
|
|
|
|
kube::util::wait_for_url "${API_HOST}:${API_PORT}/healthz" "apiserver: "
|
|
|
|
kube::log::status "Updating " ${OPENAPI_ROOT_DIR}
|
|
|
|
curl -w "\n" -fs "${API_HOST}:${API_PORT}/swagger.json" > "${OPENAPI_ROOT_DIR}/swagger.json"
|
|
|
|
kube::log::status "SUCCESS"
|
|
|
|
# ex: ts=2 sw=2 et filetype=sh
|