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

Add 60 seconds to server upgrade wait to account for delays in apiserver readiness 

Also change cleanup helper to ensure upgrade test doesn't pollute the
images for the rest of the tests.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/8413/head v1.25.14+k3s1
Brad Davidson 2023-09-18 20:54:01 +00:00 committed by Brad Davidson
parent 622f183730
commit 3624e6c42c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/test-helpers
View File

@ -534,8 +534,8 @@ cleanup-test-env(){
export SERVER_ARGS='' export SERVER_ARGS=''
export WAIT_SERVICES="${all_services[*]}" export WAIT_SERVICES="${all_services[*]}"
unset AGENT_1_ARGS AGENT_2_ARGS AGENT_3_ARGS AGENT_DOCKER_ARGS unset AGENT_1_ARGS AGENT_2_ARGS AGENT_3_ARGS AGENT_DOCKER_ARGS K3S_IMAGE_AGENT
unset SERVER_1_ARGS SERVER_2_ARGS SERVER_3_ARGS SERVER_DOCKER_ARGS unset SERVER_1_ARGS SERVER_2_ARGS SERVER_3_ARGS SERVER_DOCKER_ARGS K3S_IMAGE_SERVER
unset -f server-pre-hook server-post-hook agent-pre-hook agent-post-hook cluster-pre-hook cluster-post-hook test-post-hook test-cleanup-hook unset -f server-pre-hook server-post-hook agent-pre-hook agent-post-hook cluster-pre-hook cluster-post-hook test-post-hook test-cleanup-hook
} }

6
scripts/test-run-upgrade
View File

@ -41,9 +41,11 @@ start-test() {
kubectl get node -o wide kubectl get node -o wide
kubectl create -f scripts/airgap/volume-test.yaml kubectl create -f scripts/airgap/volume-test.yaml
# Add post-hook sleeps to give the kubelet time to update the version after startup # Add post-hook sleeps to give the kubelet time to update the version after startup.
# Server gets an extra 60 seconds to handle the metrics-server service being unavailable:
# https://github.com/kubernetes/kubernetes/issues/120739
server-post-hook(){ server-post-hook(){
sleep 15 sleep 75
} }
export -f server-post-hook export -f server-post-hook
agent-post-hook(){ agent-post-hook(){