mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-10-25 10:00:53 +00:00
Automatic merge from submit-queue (batch tested with PRs 39694, 39383, 39651, 39691, 39497) Bump container-linux and gci timeout for docker health check The command `docker ps` can take longer time to respond under heavy load or when encountering some known issues. In these cases, the containers are running fine, so aggressive health check could cause serious disruption. Bump the timeout to 60s to be consistent with the debian-based containerVM. This addresses #38588