mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-03 01:06:27 +00:00
Merge pull request #19512 from mml/update-objects
Auto commit by PR queue bot
This commit is contained in:
commit
729a76f749
@ -63,6 +63,9 @@ function startApiServer() {
|
|||||||
function killApiServer() {
|
function killApiServer() {
|
||||||
kube::log::status "Killing api server"
|
kube::log::status "Killing api server"
|
||||||
[[ -n ${APISERVER_PID-} ]] && kill ${APISERVER_PID} 1>&2 2>/dev/null
|
[[ -n ${APISERVER_PID-} ]] && kill ${APISERVER_PID} 1>&2 2>/dev/null
|
||||||
|
|
||||||
|
wait ${APISERVER_PID} || true
|
||||||
|
kube::log::status "api server exited"
|
||||||
unset APISERVER_PID
|
unset APISERVER_PID
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -114,12 +117,16 @@ ${UPDATE_ETCD_OBJECTS_SCRIPT}
|
|||||||
killApiServer
|
killApiServer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#######################################################
|
#######################################################
|
||||||
# Step 3 : Start a server which supports only the new api version.
|
# Step 3 : Start a server which supports only the new api version.
|
||||||
#######################################################
|
#######################################################
|
||||||
|
|
||||||
KUBE_API_VERSIONS="${KUBE_NEW_API_VERSION}"
|
KUBE_API_VERSIONS="${KUBE_NEW_API_VERSION}"
|
||||||
RUNTIME_CONFIG="api/all=false,api/${KUBE_NEW_API_VERSION}=true"
|
RUNTIME_CONFIG="api/all=false,api/${KUBE_NEW_API_VERSION}=true"
|
||||||
|
|
||||||
|
# This seems to reduce flakiness.
|
||||||
|
sleep 1
|
||||||
startApiServer
|
startApiServer
|
||||||
|
|
||||||
# Verify that the server is able to read the object.
|
# Verify that the server is able to read the object.
|
||||||
|
Loading…
Reference in New Issue
Block a user