From 361b247586f6c36382e4179cad63d69462edfb7e Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 10 Apr 2025 16:00:35 +0200 Subject: [PATCH] overlay coreos: Drop obsolete subreaper key from containerd config This key was first renamed to no_subreaper in 2017, then eventually dropped. Now containerd prints a warning like: time="2025-04-08T22:59:42Z" level=warning msg="Ignoring unknown key in TOML" column=1 error="strict mode: fields in the document are missing in the target struct" file=/usr/share/containerd/config.toml key=subreaper row=8 There seem to be no replacement for it, so just drop it. --- .../sysext/containerd/usr/share/containerd/config-cgroupfs.toml | 2 -- .../coreos/sysext/containerd/usr/share/containerd/config.toml | 2 -- 2 files changed, 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config-cgroupfs.toml b/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config-cgroupfs.toml index 742fbf4355c..1615541b37d 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config-cgroupfs.toml +++ b/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config-cgroupfs.toml @@ -4,8 +4,6 @@ version = 2 root = "/var/lib/containerd" # runtime state information state = "/run/containerd" -# set containerd as a subreaper on linux when it is not running as PID 1 -subreaper = true # set containerd's OOM score oom_score = -999 disabled_plugins = [] diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config.toml b/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config.toml index babc77b0e06..16ea4abb115 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config.toml +++ b/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config.toml @@ -4,8 +4,6 @@ version = 2 root = "/var/lib/containerd" # runtime state information state = "/run/containerd" -# set containerd as a subreaper on linux when it is not running as PID 1 -subreaper = true # set containerd's OOM score oom_score = -999 disabled_plugins = []