kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

daemon/graphdriver/overlay2: remove deprecated overrideKernelCheck

Browse source 
Commit 955c1f881a (Docker v17.12.0) replaced
detection of support for multiple lowerdirs (as required by overlay2) to not
depend on the kernel version. The `overlay2.override_kernel_check` was still
used to print a warning that older kernel versions may not have full support.

After this, commit e226aea280 (Docker v20.10.0,
backported to v19.03.7) removed uses of the `overlay2.override_kernel_check`
option altogether, but we were still parsing it.

This patch changes the `parseOptions()` function to not parse the option,
printing a deprecation warning instead. We should change this to be an error,
but the  `overlay2.override_kernel_check` option was not deprecated in the
documentation, so keeping it around for one more release.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-10-10 14:46:43 +02:00
parent b43a7ac530
commit e35700eb50
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
daemon/graphdriver/overlay2/overlay.go
View file

@ -85,8 +85,7 @@ const (
) )
type overlayOptions struct { type overlayOptions struct {
overrideKernelCheck bool quota quota.Quota
quota quota.Quota
} }
// Driver contains information about the home directory and the list of active // Driver contains information about the home directory and the list of active
@ -236,10 +235,8 @@ func parseOptions(options []string) (*overlayOptions, error) {
key = strings.ToLower(key) key = strings.ToLower(key)
switch key { switch key {
case "overlay2.override_kernel_check": case "overlay2.override_kernel_check":
o.overrideKernelCheck, err = strconv.ParseBool(val) // TODO(thaJeztah): change this to an error, see https://github.com/docker/cli/pull/3806
if err != nil { logger.Warn("DEPRECATED: the overlay2.override_kernel_check option is ignored and will be removed in the next release. You can safely remove this option from your configuration.")
return nil, err
}
case "overlay2.size": case "overlay2.size":
size, err := units.RAMInBytes(val) size, err := units.RAMInBytes(val)
if err != nil { if err != nil {