0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #44278 from thaJeztah/overlay_remove_kernel_check_override

Browse source 
daemon/graphdriver/overlay2: remove deprecated overrideKernelCheck
This commit is contained in:
Sebastiaan van Stijn 2022-10-13 22:35:25 +02:00 • committed by GitHub
commit f29a3eb9c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 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 {
overrideKernelCheck bool
quota quota.Quota
quota quota.Quota
}
// 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)
switch key {
case "overlay2.override_kernel_check":
o.overrideKernelCheck, err = strconv.ParseBool(val)
if err != nil {
return nil, err
}
// TODO(thaJeztah): change this to an error, see https://github.com/docker/cli/pull/3806
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.")
case "overlay2.size":
size, err := units.RAMInBytes(val)
if err != nil {

2
integration/plugin/graphdriver/external_test.go
View file

@ -432,7 +432,7 @@ func TestGraphdriverPluginV2(t *testing.T) {
// restart the daemon with the plugin set as the storage driver
d.Stop(t)
d.StartWithBusybox(t, "-s", plugin, "--storage-opt", "overlay2.override_kernel_check=1")
d.StartWithBusybox(t, "-s", plugin)
testGraphDriver(ctx, t, client, plugin, nil)
}