Merge pull request #321 from kairos-io/missing-install-keys

Add missing keys to Install struct
kairos-io · May 6, 2024 · 3906a62 · 3906a62
2 parents c043728 + eb4be08
commit 3906a62
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/go.mod b/go.mod
@@ -19,7 +19,7 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/jaypipes/ghw v0.12.0
 	github.com/joho/godotenv v1.5.1
-	github.com/kairos-io/kairos-sdk v0.1.2
+	github.com/kairos-io/kairos-sdk v0.1.3
 	github.com/kairos-io/kcrypt v0.10.1
 	github.com/labstack/echo/v4 v4.12.0
 	github.com/mitchellh/mapstructure v1.5.0

diff --git a/go.sum b/go.sum
@@ -307,6 +307,8 @@ github.com/kairos-io/kairos-sdk v0.1.1 h1:A9/bweW+Oy0Tmp3l7R4kL4NZXTJcKPXpp1/7u/
 github.com/kairos-io/kairos-sdk v0.1.1/go.mod h1:sR1X4B3F1nkaECQ1vdsJ78OIkfLfyB22/aIpdRQJ/Mo=
 github.com/kairos-io/kairos-sdk v0.1.2 h1:veA06dQR4zddrWSxaZNq+5lSZQH0EHlU6OnR5fdkQ2Q=
 github.com/kairos-io/kairos-sdk v0.1.2/go.mod h1:sR1X4B3F1nkaECQ1vdsJ78OIkfLfyB22/aIpdRQJ/Mo=
+github.com/kairos-io/kairos-sdk v0.1.3 h1:mdGdr5mWQ6FXZkXPsDRBvCdZDIKbFpub40idtsSTN8k=
+github.com/kairos-io/kairos-sdk v0.1.3/go.mod h1:sR1X4B3F1nkaECQ1vdsJ78OIkfLfyB22/aIpdRQJ/Mo=
 github.com/kairos-io/kcrypt v0.9.1 h1:bMDXZ8MiPY/fgLe5CXQPfUIRchzxErlJ8nfZM/JPfEU=
 github.com/kairos-io/kcrypt v0.9.1/go.mod h1:odsVL3ab2GJUgDnvDGJi54jrWUe6tjfW9875knT/ltU=
 github.com/kairos-io/kcrypt v0.10.1 h1:lFBUyObvrb16BHYuTWI24IwX7ageNTnPS8JKYFq8mJ8=

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -33,19 +33,23 @@ const (
 )
 
 type Install struct {
-	Auto                   bool              `yaml:"auto,omitempty"`
-	Reboot                 bool              `yaml:"reboot,omitempty"`
-	NoFormat               bool              `yaml:"no-format,omitempty"`
-	Device                 string            `yaml:"device,omitempty"`
-	Poweroff               bool              `yaml:"poweroff,omitempty"`
-	GrubOptions            map[string]string `yaml:"grub_options,omitempty"`
-	Bundles                Bundles           `yaml:"bundles,omitempty"`
-	Encrypt                []string          `yaml:"encrypted_partitions,omitempty"`
-	SkipEncryptCopyPlugins bool              `yaml:"skip_copy_kcrypt_plugin,omitempty"`
-	Env                    []string          `yaml:"env,omitempty"`
-	Source                 string            `yaml:"source,omitempty"`
-	EphemeralMounts        []string          `yaml:"ephemeral_mounts,omitempty"`
-	BindMounts             []string          `yaml:"bind_mounts,omitempty"`
+	Auto                   bool                   `yaml:"auto,omitempty"`
+	Reboot                 bool                   `yaml:"reboot,omitempty"`
+	NoFormat               bool                   `yaml:"no-format,omitempty"`
+	Device                 string                 `yaml:"device,omitempty"`
+	Poweroff               bool                   `yaml:"poweroff,omitempty"`
+	GrubOptions            map[string]string      `yaml:"grub_options,omitempty"`
+	Bundles                Bundles                `yaml:"bundles,omitempty"`
+	Encrypt                []string               `yaml:"encrypted_partitions,omitempty"`
+	SkipEncryptCopyPlugins bool                   `yaml:"skip_copy_kcrypt_plugin,omitempty"`
+	Env                    []string               `yaml:"env,omitempty"`
+	Source                 string                 `yaml:"source,omitempty"`
+	EphemeralMounts        []string               `yaml:"ephemeral_mounts,omitempty"`
+	BindMounts             []string               `yaml:"bind_mounts,omitempty"`
+	Partitions             v1.ElementalPartitions `yaml:"partitions,omitempty" mapstructure:"partitions"`
+	Active                 v1.Image               `yaml:"system,omitempty" mapstructure:"system"`
+	Recovery               v1.Image               `yaml:"recovery-system,omitempty" mapstructure:"recovery-system"`
+	Passive                v1.Image               `yaml:"passive,omitempty" mapstructure:"recovery-system"`
 }
 
 func NewConfig(opts ...GenericOptions) *Config {