Merge pull request #44278 from thaJeztah/overlay_remove_kernel_check_override

daemon/graphdriver/overlay2: remove deprecated overrideKernelCheck

daemon/graphdriver/overlay2/overlay.go

@@ -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 {

integration/plugin/graphdriver/external_test.go

@@ -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)
 }