diff options
| author | Sebastiaan van Stijn <github@gone.nl> | 2023-05-06 15:04:41 +0200 |
|---|---|---|
| committer | Sebastiaan van Stijn <github@gone.nl> | 2023-05-06 16:36:17 +0200 |
| commit | fb96b94ed00aa4f200dc03642bc46d4289eb6860 (patch) | |
| tree | 2b8288902106d1f148b08177c825188e8e1ec974 /libcontainerd | |
| parent | 316781be48bb72770e07d41d469c79ef4194483b (diff) | |
| download | docker-fb96b94ed00aa4f200dc03642bc46d4289eb6860.tar.gz | |
daemon: remove handling for deprecated "oom-score-adjust", and produce error
This option was deprecated in 5a922dc162bbe0a03450165da4e6aceca55073d4, which
is part of the v24.0.0 release, so we can remove it from master.
This patch;
- adds a check to ValidatePlatformConfig, and produces a fatal error
if oom-score-adjust is set
- removes the deprecated libcontainerd/supervisor.WithOOMScore
- removes the warning from docker info
With this patch:
dockerd --oom-score-adjust=-500 --validate
Flag --oom-score-adjust has been deprecated, and will be removed in the next release.
unable to configure the Docker daemon with file /etc/docker/daemon.json: merged configuration validation from file and command line flags failed: DEPRECATED: The "oom-score-adjust" config parameter and the dockerd "--oom-score-adjust" options have been removed.
And when using `daemon.json`:
dockerd --validate
unable to configure the Docker daemon with file /etc/docker/daemon.json: merged configuration validation from file and command line flags failed: DEPRECATED: The "oom-score-adjust" config parameter and the dockerd "--oom-score-adjust" options have been removed.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Diffstat (limited to 'libcontainerd')
| -rw-r--r-- | libcontainerd/supervisor/remote_daemon_options_linux.go | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/libcontainerd/supervisor/remote_daemon_options_linux.go b/libcontainerd/supervisor/remote_daemon_options_linux.go deleted file mode 100644 index 3ae0d6cc6c..0000000000 --- a/libcontainerd/supervisor/remote_daemon_options_linux.go +++ /dev/null @@ -1,11 +0,0 @@ -package supervisor // import "github.com/docker/docker/libcontainerd/supervisor" - -// WithOOMScore defines the oom_score_adj to set for the containerd process. -// -// Deprecated: setting the oom-score-adjust from the daemon itself is deprecated, and should be handled by the process-manager starting the daemon instead. -func WithOOMScore(score int) DaemonOpt { - return func(r *remote) error { - r.oomScore = score - return nil - } -} |