Merge installation disk and data disk page & change disk limit.

Signed-off-by: masteryyh <[email protected]>
harvester · Jul 12, 2023 · f780d18 · f780d18
1 parent 1ec4b01
commit f780d18
Show file tree

Hide file tree

Showing 6 changed files with 249 additions and 339 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -31,7 +31,8 @@ const (
 )
 
 const (
-	HardMinDiskSizeGiB     = 250
+	SingleDiskMinSizeGiB   = 250
+	MultipleDiskMinSizeGiB = 180
 	HardMinDataDiskSizeGiB = 50
 	MaxPods                = 200
 )

diff --git a/pkg/console/constant.go b/pkg/console/constant.go
@@ -78,7 +78,7 @@ const (
 	dnsServersNote         = "Note: You can use comma to add more DNS servers. Leave blank to use default DNS."
 	bondNote               = "Note: Select one or more NICs for the Management NIC.\nUse the default value for the Bond Mode if only one NIC is selected."
 	forceMBRNote           = "Note: GPT is used by default. You can use MBR if you encountered compatibility issues."
-	persistentSizeNote     = "Note: persistent partition stores data like system package and container images, not the VM data. \nYou can specify a size like 200Gi or 15360Mi. \nLeave it blank to use the default value."
+	persistentSizeNote     = "Note: persistent partition stores data like system package and container images, not the VM data. \nYou can specify a size like 200Gi or 153600Mi. \nLeave it blank to use the default value."
 
 	authorizedFile = "/home/rancher/.ssh/authorized_keys"
 )
diff --git a/pkg/console/helper.go b/pkg/console/helper.go
@@ -32,13 +32,7 @@ func (p *passwordWrapper) passwordVEscapeKeyBinding(g *gocui.Gui, v *gocui.View)
 	p.passwordV.Close()
 	p.passwordConfirmV.Close()
 	if installModeOnly {
-		if canChoose, err := canChooseDataDisk(); err != nil {
-			return err
-		} else if canChoose {
-			return showDataDiskPage(p.c)
-		} else {
-			return showDiskPage(p.c)
-		}
+		return showDiskPage(p.c)
 	}
 	if err := p.c.setContentByName(notePanel, ""); err != nil {
 		return err
@@ -85,13 +79,7 @@ func (p *passwordWrapper) passwordConfirmVKeyEscape(g *gocui.Gui, v *gocui.View)
 		return err
 	}
 	if installModeOnly {
-		if canChoose, err := canChooseDataDisk(); err != nil {
-			return err
-		} else if canChoose {
-			return showDataDiskPage(p.c)
-		} else {
-			return showDiskPage(p.c)
-		}
+		return showDiskPage(p.c)
 	}
 	return showNext(p.c, tokenPanel)
 }