Auto calculate partiton size on install (#121)

Author: Itxaka

pkg/config/spec.go

@@ -85,20 +85,23 @@ func NewInstallSpec(cfg *Config) *v1.InstallSpec {
 		Size:   constants.ImgSize,
 	}
 
-	return &v1.InstallSpec{
-		Target:     cfg.Install.Device,
-		Firmware:   firmware,
-		PartTable:  v1.GPT,
-		Partitions: NewInstallElementalPartitions(),
-		GrubConf:   constants.GrubConf,
-		Tty:        constants.DefaultTty,
-		Active:     activeImg,
-		Recovery:   recoveryImg,
-		Passive:    passiveImg,
-	}
+	spec := &v1.InstallSpec{
+		Target:    cfg.Install.Device,
+		Firmware:  firmware,
+		PartTable: v1.GPT,
+		GrubConf:  constants.GrubConf,
+		Tty:       constants.DefaultTty,
+		Active:    activeImg,
+		Recovery:  recoveryImg,
+		Passive:   passiveImg,
+	}
+	// Calculate the partitions sizes automatically based on the images set size
+	spec.Partitions = NewInstallElementalPartitions(spec)
+
+	return spec
 }
 
-func NewInstallElementalPartitions() v1.ElementalPartitions {
+func NewInstallElementalPartitions(spec *v1.InstallSpec) v1.ElementalPartitions {
 	pt := v1.ElementalPartitions{}
 	pt.OEM = &v1.Partition{
 		FilesystemLabel: constants.OEMLabel,
@@ -111,7 +114,7 @@ func NewInstallElementalPartitions() v1.ElementalPartitions {
 
 	pt.Recovery = &v1.Partition{
 		FilesystemLabel: constants.RecoveryLabel,
-		Size:            constants.RecoverySize,
+		Size:            spec.Recovery.Size + 100,
 		Name:            constants.RecoveryPartName,
 		FS:              constants.LinuxFs,
 		MountPoint:      constants.RecoveryDir,
@@ -120,7 +123,7 @@ func NewInstallElementalPartitions() v1.ElementalPartitions {
 
 	pt.State = &v1.Partition{
 		FilesystemLabel: constants.StateLabel,
-		Size:            constants.StateSize,
+		Size:            spec.Active.Size + spec.Passive.Size + 100,
 		Name:            constants.StatePartName,
 		FS:              constants.LinuxFs,
 		MountPoint:      constants.StateDir,

pkg/config/spec_test.go

@@ -18,22 +18,21 @@ package config_test
 
 import (
 	"fmt"
+	"github.com/jaypipes/ghw/pkg/block"
 	config "github.com/kairos-io/kairos-agent/v2/pkg/config"
+	"github.com/kairos-io/kairos-agent/v2/pkg/constants"
+	v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1"
 	"github.com/kairos-io/kairos-agent/v2/pkg/utils/fs"
+	v1mock "github.com/kairos-io/kairos-agent/v2/tests/mocks"
 	"github.com/kairos-io/kairos-sdk/collector"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 	"github.com/sanity-io/litter"
 	"github.com/sirupsen/logrus"
+	"github.com/twpayne/go-vfs/vfst"
 	"k8s.io/mount-utils"
 	"os"
 	"path/filepath"
-
-	"github.com/jaypipes/ghw/pkg/block"
-	"github.com/kairos-io/kairos-agent/v2/pkg/constants"
-	v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1"
-	v1mock "github.com/kairos-io/kairos-agent/v2/tests/mocks"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-	"github.com/twpayne/go-vfs/vfst"
 )
 
 var _ = Describe("Types", Label("types", "config"), func() {

pkg/elemental/elemental_test.go

@@ -83,7 +83,8 @@ var _ = Describe("Elemental", Label("elemental"), func() {
 		var el *elemental.Elemental
 		var parts v1.ElementalPartitions
 		BeforeEach(func() {
-			parts = agentConfig.NewInstallElementalPartitions()
+			spec := &v1.InstallSpec{}
+			parts = agentConfig.NewInstallElementalPartitions(spec)
 
 			err := fsutils.MkdirAll(fs, "/some", cnst.DirPerm)
 			Expect(err).ToNot(HaveOccurred())
@@ -147,7 +148,8 @@ var _ = Describe("Elemental", Label("elemental"), func() {
 		var el *elemental.Elemental
 		var parts v1.ElementalPartitions
 		BeforeEach(func() {
-			parts = agentConfig.NewInstallElementalPartitions()
+			spec := &v1.InstallSpec{}
+			parts = agentConfig.NewInstallElementalPartitions(spec)
 
 			err := fsutils.MkdirAll(fs, "/some", cnst.DirPerm)
 			Expect(err).ToNot(HaveOccurred())
@@ -195,7 +197,8 @@ var _ = Describe("Elemental", Label("elemental"), func() {
 		var el *elemental.Elemental
 		var parts v1.ElementalPartitions
 		BeforeEach(func() {
-			parts = agentConfig.NewInstallElementalPartitions()
+			spec := &v1.InstallSpec{}
+			parts = agentConfig.NewInstallElementalPartitions(spec)
 
 			err := fsutils.MkdirAll(fs, "/some", cnst.DirPerm)
 			Expect(err).ToNot(HaveOccurred())
@@ -384,13 +387,13 @@ var _ = Describe("Elemental", Label("elemental"), func() {
 						"mkpart", "oem", "ext4", "133120", "264191",
 					}, {"mkfs.ext4", "-L", "COS_OEM", "/some/device2"}, {
 						"parted", "--script", "--machine", "--", "/some/device", "unit", "s",
-						"mkpart", "recovery", "ext4", "264192", "17041407",
+						"mkpart", "recovery", "ext4", "264192", "6760447",
 					}, {"mkfs.ext4", "-L", "COS_RECOVERY", "/some/device3"}, {
 						"parted", "--script", "--machine", "--", "/some/device", "unit", "s",
-						"mkpart", "state", "ext4", "17041408", "48498687",
+						"mkpart", "state", "ext4", "6760448", "19548159",
 					}, {"mkfs.ext4", "-L", "COS_STATE", "/some/device4"}, {
 						"parted", "--script", "--machine", "--", "/some/device", "unit", "s",
-						"mkpart", "persistent", "ext4", "48498688", "100%",
+						"mkpart", "persistent", "ext4", "19548160", "100%",
 					}, {"mkfs.ext4", "-L", "COS_PERSISTENT", "/some/device5"},
 				}