From cba8a26c4820b3bc9623c2079c218773fb3dec62 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 14 Apr 2025 09:35:32 +0200 Subject: [PATCH 1/2] Disable pull-progress-timeout per default Follow-up on https://github.com/cri-o/cri-o/pull/9108 and multiple requests to disable the timeout per default. Cherry-picked: 44d9073dd1133856ffd0858b5d550ce7427335d6 Signed-off-by: Sascha Grunert --- docs/crio.8.md | 2 +- docs/crio.conf.5.md | 2 +- pkg/config/config.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/crio.8.md b/docs/crio.8.md index fa0d02b6563..c8ec37c2b20 100644 --- a/docs/crio.8.md +++ b/docs/crio.8.md @@ -384,7 +384,7 @@ crio [GLOBAL OPTIONS] command [COMMAND OPTIONS] [ARGUMENTS...] **--profile-port**="": Port for the pprof profiler. (default: 6060) -**--pull-progress-timeout**="": The timeout for an image pull to make progress until the pull operation gets canceled. This value will be also used for calculating the pull progress interval to --pull-progress-timeout / 10. Can be set to 0 to disable the timeout as well as the progress output. (default: 10s) +**--pull-progress-timeout**="": The timeout for an image pull to make progress until the pull operation gets canceled. This value will be also used for calculating the pull progress interval to --pull-progress-timeout / 10. Can be set to 0 to disable the timeout as well as the progress output. (default: 0s) **--rdt-config-file**="": Path to the RDT configuration file for configuring the resctrl pseudo-filesystem. diff --git a/docs/crio.conf.5.md b/docs/crio.conf.5.md index 451131c6113..aa473da01b9 100644 --- a/docs/crio.conf.5.md +++ b/docs/crio.conf.5.md @@ -479,7 +479,7 @@ CRI-O reads its configured registries defaults from the system wide containers-r **auto_reload_registries**=false If true, CRI-O will automatically reload the mirror registry when there is an update to the 'registries.conf.d' directory. Default value is set to 'false'. -**pull_progress_timeout**="10s" +**pull_progress_timeout**="0s" The timeout for an image pull to make progress until the pull operation gets canceled. This value will be also used for calculating the pull progress interval to pull_progress_timeout / 10. Can be set to 0 to disable the timeout as well as the progress output. ## CRIO.NETWORK TABLE diff --git a/pkg/config/config.go b/pkg/config/config.go index e0abdc63747..2dba15696b2 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -933,7 +933,7 @@ func DefaultConfig() (*Config, error) { PauseCommand: "/pause", ImageVolumes: ImageVolumesMkdir, SignaturePolicyDir: "/etc/crio/policies", - PullProgressTimeout: 10 * time.Second, + PullProgressTimeout: 0, }, NetworkConfig: NetworkConfig{ NetworkDir: cniConfigDir, From 729db6b5c608f86aad29ac12b778e976c186da7f Mon Sep 17 00:00:00 2001 From: Kubernetes Release Robot Date: Sun, 1 Jun 2025 00:38:43 +0000 Subject: [PATCH 2/2] version: bump to 1.30.14 Signed-off-by: Kubernetes Release Robot --- internal/version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/version/version.go b/internal/version/version.go index 1bf386aff41..879317090bd 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -21,7 +21,7 @@ import ( ) // Version is the version of the build. -const Version = "1.30.13" +const Version = "1.30.14" // Variables injected during build-time var (