Changed default driver to overlay2

bentastic27 · luthermonson · commit bfb20b42bcbd · 2020-07-15T14:48:56.000-07:00
diff --git a/libmachine/libmachine.go b/libmachine/libmachine.go
@@ -75,7 +75,7 @@ func (api *Client) NewHost(driverName string, rawDriver []byte) (*host.Host, err
 			},
 			EngineOptions: &engine.Options{
 				InstallURL:    drivers.DefaultEngineInstallURL,
-				StorageDriver: "aufs",
+				StorageDriver: "overlay2",
 				TLSVerify:     true,
 			},
 			SwarmOptions: &swarm.Options{
diff --git a/libmachine/provision/debian.go b/libmachine/provision/debian.go
@@ -86,7 +86,7 @@ func (provisioner *DebianProvisioner) Provision(swarmOptions swarm.Options, auth
 	provisioner.EngineOptions = engineOptions
 	swarmOptions.Env = engineOptions.Env
 
-	storageDriver, err := decideStorageDriver(provisioner, "aufs", engineOptions.StorageDriver)
+	storageDriver, err := decideStorageDriver(provisioner, "overlay2", engineOptions.StorageDriver)
 	if err != nil {
 		return err
 	}
diff --git a/libmachine/provision/debian_test.go b/libmachine/provision/debian_test.go
@@ -14,7 +14,7 @@ func TestDebianDefaultStorageDriver(t *testing.T) {
 	p := NewDebianProvisioner(&fakedriver.Driver{}).(*DebianProvisioner)
 	p.SSHCommander = provisiontest.NewFakeSSHCommander(provisiontest.FakeSSHCommanderOptions{})
 	p.Provision(swarm.Options{}, auth.Options{}, engine.Options{})
-	if p.EngineOptions.StorageDriver != "aufs" {
-		t.Fatal("Default storage driver should be aufs")
+	if p.EngineOptions.StorageDriver != "overlay2" {
+		t.Fatal("Default storage driver should be overlay2")
 	}
 }
diff --git a/libmachine/provision/ubuntu_systemd.go b/libmachine/provision/ubuntu_systemd.go
@@ -102,7 +102,7 @@ func (provisioner *UbuntuSystemdProvisioner) Provision(swarmOptions swarm.Option
 	provisioner.EngineOptions = engineOptions
 	swarmOptions.Env = engineOptions.Env
 
-	storageDriver, err := decideStorageDriver(provisioner, "aufs", engineOptions.StorageDriver)
+	storageDriver, err := decideStorageDriver(provisioner, "overlay2", engineOptions.StorageDriver)
 	if err != nil {
 		return err
 	}
diff --git a/libmachine/provision/ubuntu_systemd_test.go b/libmachine/provision/ubuntu_systemd_test.go
@@ -38,7 +38,7 @@ func TestUbuntuSystemdDefaultStorageDriver(t *testing.T) {
 	p := NewUbuntuSystemdProvisioner(&fakedriver.Driver{}).(*UbuntuSystemdProvisioner)
 	p.SSHCommander = provisiontest.NewFakeSSHCommander(provisiontest.FakeSSHCommanderOptions{})
 	p.Provision(swarm.Options{}, auth.Options{}, engine.Options{})
-	if p.EngineOptions.StorageDriver != "aufs" {
-		t.Fatal("Default storage driver should be aufs")
+	if p.EngineOptions.StorageDriver != "overlay2" {
+		t.Fatal("Default storage driver should be overlay2")
 	}
 }
diff --git a/libmachine/provision/utils.go b/libmachine/provision/utils.go
@@ -223,7 +223,7 @@ func decideStorageDriver(p Provisioner, defaultDriver, suppliedDriver string) (s
 		}
 	}()
 
-	if defaultDriver != "aufs" {
+	if defaultDriver != "overlay2" {
 		bestSuitedDriver = defaultDriver
 	} else {
 		remoteFilesystemType, err := getFilesystemType(p, "/var/lib")
@@ -233,7 +233,7 @@ func decideStorageDriver(p Provisioner, defaultDriver, suppliedDriver string) (s
 		if remoteFilesystemType == "btrfs" {
 			bestSuitedDriver = "btrfs"
 		} else {
-			bestSuitedDriver = "aufs"
+			bestSuitedDriver = "overlay2"
 		}
 	}
 	return bestSuitedDriver, nil

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ func (provisioner *DebianProvisioner) Provision(swarmOptions swarm.Options, auth`
`86`	`86`	`provisioner.EngineOptions = engineOptions`
`87`	`87`	`swarmOptions.Env = engineOptions.Env`
`88`	`88`
`89`		`- storageDriver, err := decideStorageDriver(provisioner, "aufs", engineOptions.StorageDriver)`
	`89`	`+ storageDriver, err := decideStorageDriver(provisioner, "overlay2", engineOptions.StorageDriver)`
`90`	`90`	`if err != nil {`
`91`	`91`	`return err`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ func TestDebianDefaultStorageDriver(t *testing.T) {`
`14`	`14`	`p := NewDebianProvisioner(&fakedriver.Driver{}).(*DebianProvisioner)`
`15`	`15`	`p.SSHCommander = provisiontest.NewFakeSSHCommander(provisiontest.FakeSSHCommanderOptions{})`
`16`	`16`	`p.Provision(swarm.Options{}, auth.Options{}, engine.Options{})`
`17`		`- if p.EngineOptions.StorageDriver != "aufs" {`
`18`		`- t.Fatal("Default storage driver should be aufs")`
	`17`	`+ if p.EngineOptions.StorageDriver != "overlay2" {`
	`18`	`+ t.Fatal("Default storage driver should be overlay2")`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ func (provisioner *UbuntuSystemdProvisioner) Provision(swarmOptions swarm.Option`
`102`	`102`	`provisioner.EngineOptions = engineOptions`
`103`	`103`	`swarmOptions.Env = engineOptions.Env`
`104`	`104`
`105`		`- storageDriver, err := decideStorageDriver(provisioner, "aufs", engineOptions.StorageDriver)`
	`105`	`+ storageDriver, err := decideStorageDriver(provisioner, "overlay2", engineOptions.StorageDriver)`
`106`	`106`	`if err != nil {`
`107`	`107`	`return err`
`108`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ func TestUbuntuSystemdDefaultStorageDriver(t *testing.T) {`
`38`	`38`	`p := NewUbuntuSystemdProvisioner(&fakedriver.Driver{}).(*UbuntuSystemdProvisioner)`
`39`	`39`	`p.SSHCommander = provisiontest.NewFakeSSHCommander(provisiontest.FakeSSHCommanderOptions{})`
`40`	`40`	`p.Provision(swarm.Options{}, auth.Options{}, engine.Options{})`
`41`		`- if p.EngineOptions.StorageDriver != "aufs" {`
`42`		`- t.Fatal("Default storage driver should be aufs")`
	`41`	`+ if p.EngineOptions.StorageDriver != "overlay2" {`
	`42`	`+ t.Fatal("Default storage driver should be overlay2")`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ func decideStorageDriver(p Provisioner, defaultDriver, suppliedDriver string) (s`
`223`	`223`	`}`
`224`	`224`	`}()`
`225`	`225`
`226`		`- if defaultDriver != "aufs" {`
	`226`	`+ if defaultDriver != "overlay2" {`
`227`	`227`	`bestSuitedDriver = defaultDriver`
`228`	`228`	`} else {`
`229`	`229`	`remoteFilesystemType, err := getFilesystemType(p, "/var/lib")`
`@@ -233,7 +233,7 @@ func decideStorageDriver(p Provisioner, defaultDriver, suppliedDriver string) (s`
`233`	`233`	`if remoteFilesystemType == "btrfs" {`
`234`	`234`	`bestSuitedDriver = "btrfs"`
`235`	`235`	`} else {`
`236`		`- bestSuitedDriver = "aufs"`
	`236`	`+ bestSuitedDriver = "overlay2"`
`237`	`237`	`}`
`238`	`238`	`}`
`239`	`239`	`return bestSuitedDriver, nil`