Merge pull request rancher#92 from luthermonson/overlay2-default

luthermonson · web-flow · commit 7fde9d7a49cd · 2020-07-16T13:17:56.000-07:00
Overlay2 as the Default Storage Driver
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: provision.DefaultStorageDriver,
 				TLSVerify:     true,
 			},
 			SwarmOptions: &swarm.Options{
diff --git a/libmachine/provision/boot2docker.go b/libmachine/provision/boot2docker.go
@@ -232,7 +232,7 @@ func (provisioner *Boot2DockerProvisioner) Provision(swarmOptions swarm.Options,
 	swarmOptions.Env = engineOptions.Env
 
 	if provisioner.EngineOptions.StorageDriver == "" {
-		provisioner.EngineOptions.StorageDriver = "aufs"
+		provisioner.EngineOptions.StorageDriver = DefaultStorageDriver
 	}
 
 	if err = provisioner.SetHostname(provisioner.Driver.GetMachineName()); err != nil {
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, DefaultStorageDriver, 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 != DefaultStorageDriver {
+		t.Fatalf("Default storage driver should be %s", DefaultStorageDriver)
 	}
 }
diff --git a/libmachine/provision/provisioner.go b/libmachine/provision/provisioner.go
@@ -19,6 +19,7 @@ var (
 
 const (
 	LastReleaseBeforeCEVersioning = "1.13.1"
+	DefaultStorageDriver          = "overlay2"
 )
 
 type SSHCommander interface {
diff --git a/libmachine/provision/rancheros.go b/libmachine/provision/rancheros.go
@@ -101,7 +101,7 @@ func (provisioner *RancherProvisioner) Provision(swarmOptions swarm.Options, aut
 	swarmOptions.Env = engineOptions.Env
 
 	if provisioner.EngineOptions.StorageDriver == "" {
-		provisioner.EngineOptions.StorageDriver = "overlay2"
+		provisioner.EngineOptions.StorageDriver = DefaultStorageDriver
 	} else if provisioner.EngineOptions.StorageDriver != "overlay" && provisioner.EngineOptions.StorageDriver != "overlay2" {
 		return fmt.Errorf("Unsupported storage driver: %s", provisioner.EngineOptions.StorageDriver)
 	}
diff --git a/libmachine/provision/redhat.go b/libmachine/provision/redhat.go
@@ -134,7 +134,7 @@ func (provisioner *RedHatProvisioner) Provision(swarmOptions swarm.Options, auth
 	swarmOptions.Env = engineOptions.Env
 
 	// set default storage driver for redhat
-	storageDriver, err := decideStorageDriver(provisioner, "overlay2", engineOptions.StorageDriver)
+	storageDriver, err := decideStorageDriver(provisioner, DefaultStorageDriver, engineOptions.StorageDriver)
 	if err != nil {
 		return err
 	}
diff --git a/libmachine/provision/redhat_test.go b/libmachine/provision/redhat_test.go
@@ -14,7 +14,7 @@ func TestRedHatDefaultStorageDriver(t *testing.T) {
 	p := NewRedHatProvisioner("", &fakedriver.Driver{})
 	p.SSHCommander = provisiontest.NewFakeSSHCommander(provisiontest.FakeSSHCommanderOptions{})
 	p.Provision(swarm.Options{}, auth.Options{}, engine.Options{})
-	if p.EngineOptions.StorageDriver != "overlay2" {
-		t.Fatal("Default storage driver should be overlay2")
+	if p.EngineOptions.StorageDriver != DefaultStorageDriver {
+		t.Fatalf("Default storage driver should be %s", DefaultStorageDriver)
 	}
 }
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, DefaultStorageDriver, 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 != DefaultStorageDriver {
+		t.Fatalf("Default storage driver should be %s", DefaultStorageDriver)
 	}
 }
diff --git a/libmachine/provision/ubuntu_upstart.go b/libmachine/provision/ubuntu_upstart.go
@@ -118,7 +118,7 @@ func (provisioner *UbuntuProvisioner) Provision(swarmOptions swarm.Options, auth
 	provisioner.EngineOptions = engineOptions
 	swarmOptions.Env = engineOptions.Env
 
-	storageDriver, err := decideStorageDriver(provisioner, "aufs", engineOptions.StorageDriver)
+	storageDriver, err := decideStorageDriver(provisioner, DefaultStorageDriver, engineOptions.StorageDriver)
 	if err != nil {
 		return err
 	}
diff --git a/libmachine/provision/ubuntu_upstart_test.go b/libmachine/provision/ubuntu_upstart_test.go
@@ -38,7 +38,7 @@ func TestUbuntuDefaultStorageDriver(t *testing.T) {
 	p := NewUbuntuProvisioner(&fakedriver.Driver{}).(*UbuntuProvisioner)
 	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 != DefaultStorageDriver {
+		t.Fatalf("Default storage driver should be %s", DefaultStorageDriver)
 	}
 }
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 != DefaultStorageDriver {
 		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 = DefaultStorageDriver
 		}
 	}
 	return bestSuitedDriver, nil

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ func (provisioner *Boot2DockerProvisioner) Provision(swarmOptions swarm.Options,`
`232`	`232`	`swarmOptions.Env = engineOptions.Env`
`233`	`233`
`234`	`234`	`if provisioner.EngineOptions.StorageDriver == "" {`
`235`		`- provisioner.EngineOptions.StorageDriver = "aufs"`
	`235`	`+ provisioner.EngineOptions.StorageDriver = DefaultStorageDriver`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`if err = provisioner.SetHostname(provisioner.Driver.GetMachineName()); err != 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, DefaultStorageDriver, 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 != DefaultStorageDriver {`
	`18`	`+ t.Fatalf("Default storage driver should be %s", DefaultStorageDriver)`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ var (`
`19`	`19`
`20`	`20`	`const (`
`21`	`21`	`LastReleaseBeforeCEVersioning = "1.13.1"`
	`22`	`+ DefaultStorageDriver = "overlay2"`
`22`	`23`	`)`
`23`	`24`
`24`	`25`	`type SSHCommander interface {`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ func (provisioner *RancherProvisioner) Provision(swarmOptions swarm.Options, aut`
`101`	`101`	`swarmOptions.Env = engineOptions.Env`
`102`	`102`
`103`	`103`	`if provisioner.EngineOptions.StorageDriver == "" {`
`104`		`- provisioner.EngineOptions.StorageDriver = "overlay2"`
	`104`	`+ provisioner.EngineOptions.StorageDriver = DefaultStorageDriver`
`105`	`105`	`} else if provisioner.EngineOptions.StorageDriver != "overlay" && provisioner.EngineOptions.StorageDriver != "overlay2" {`
`106`	`106`	`return fmt.Errorf("Unsupported storage driver: %s", provisioner.EngineOptions.StorageDriver)`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ func (provisioner *RedHatProvisioner) Provision(swarmOptions swarm.Options, auth`
`134`	`134`	`swarmOptions.Env = engineOptions.Env`
`135`	`135`
`136`	`136`	`// set default storage driver for redhat`
`137`		`- storageDriver, err := decideStorageDriver(provisioner, "overlay2", engineOptions.StorageDriver)`
	`137`	`+ storageDriver, err := decideStorageDriver(provisioner, DefaultStorageDriver, engineOptions.StorageDriver)`
`138`	`138`	`if err != nil {`
`139`	`139`	`return err`
`140`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ func TestRedHatDefaultStorageDriver(t *testing.T) {`
`14`	`14`	`p := NewRedHatProvisioner("", &fakedriver.Driver{})`
`15`	`15`	`p.SSHCommander = provisiontest.NewFakeSSHCommander(provisiontest.FakeSSHCommanderOptions{})`
`16`	`16`	`p.Provision(swarm.Options{}, auth.Options{}, engine.Options{})`
`17`		`- if p.EngineOptions.StorageDriver != "overlay2" {`
`18`		`- t.Fatal("Default storage driver should be overlay2")`
	`17`	`+ if p.EngineOptions.StorageDriver != DefaultStorageDriver {`
	`18`	`+ t.Fatalf("Default storage driver should be %s", DefaultStorageDriver)`
`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, DefaultStorageDriver, 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 != DefaultStorageDriver {`
	`42`	`+ t.Fatalf("Default storage driver should be %s", DefaultStorageDriver)`
`43`	`43`	`}`
`44`	`44`	`}`