Merge pull request #3531 from Zyqsempai/add-default-disk-size-to-hype…

…rkit-driver Added defaultDiskSize setup to hyperkit driver
kubernetes · Jan 16, 2019 · dde313a · dde313a
2 parents d8f2e99 + 0687fea
commit dde313a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/pkg/drivers/hyperkit/driver.go b/pkg/drivers/hyperkit/driver.go
@@ -37,6 +37,7 @@ import (
 	hyperkit "github.com/moby/hyperkit/go"
 	"github.com/pkg/errors"
 	pkgdrivers "k8s.io/minikube/pkg/drivers"
+	"k8s.io/minikube/pkg/minikube/constants"
 	commonutil "k8s.io/minikube/pkg/util"
 )
 
@@ -70,6 +71,7 @@ func NewDriver(hostName, storePath string) *Driver {
 			SSHUser: "docker",
 		},
 		CommonDriver: &pkgdrivers.CommonDriver{},
+		DiskSize:     commonutil.CalculateDiskSizeInMB(constants.DefaultDiskSize),
 	}
 }
 

diff --git a/pkg/drivers/hyperkit/driver_test.go b/pkg/drivers/hyperkit/driver_test.go
@@ -20,6 +20,10 @@ package hyperkit
 
 import (
 	"testing"
+
+	"k8s.io/minikube/pkg/minikube/constants"
+
+	commonutil "k8s.io/minikube/pkg/util"
 )
 
 func Test_portExtraction(t *testing.T) {
@@ -62,6 +66,15 @@ func Test_portExtraction(t *testing.T) {
 	}
 }
 
+func Test_defaultDiskSize(t *testing.T) {
+	expectedDefaultDiscSize := commonutil.CalculateDiskSizeInMB(constants.DefaultDiskSize)
+	driver := NewDriver("", "")
+	got := driver.DiskSize
+	if got != expectedDefaultDiscSize {
+		t.Errorf("Unexpected default disk size got: %v, want: %v", got, expectedDefaultDiscSize)
+	}
+}
+
 func testEq(a, b []int) bool {
 
 	if a == nil && b == nil {