kairos/kairos-agent
1
0
Fork 0
mirror of https://github.com/kairos-io/kairos-agent.git synced 2025-09-17 07:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add test for image size calculation and respect --recovery flag

Browse Source 
Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
This commit is contained in:
Dimitris Karakasilis
2024-09-03 13:38:47 +03:00
parent 4401cedb80
commit 773b1e7d59
4 changed files with 74 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/config/spec.go
View File

@@ -324,11 +324,18 @@ func NewUpgradeSpec(cfg *Config) (*v1.UpgradeSpec, error) {
}
}
// Deep look to see if upgrade.recovery == true in the config
// if yes, we set the upgrade spec "Entry" to "recovery"
// One way to set the entry is to use the cli arg "--recovery"
// which makes config.upgrade.entry be "recovery"
// Another way is by setting the cli arg "boot-entry" which set it to the
// specified value.
// Lastly, user can set "upgrade.recovery: true" in the kairos config, which
// should result in entry being "recovery".
entry := ""
_, ok := cfg.Config["upgrade"]
if ok {
// check value from --recovery and --boot-entry
entry, _ = cfg.Config["upgrade"].(collector.Config)["entry"].(string)
// check for "upgrade.recovery: true" in the kairos config
_, ok = cfg.Config["upgrade"].(collector.Config)["recovery"]
if ok {
if cfg.Config["upgrade"].(collector.Config)["recovery"].(bool) {
@@ -372,7 +379,6 @@ func setUpgradeSourceSize(cfg *Config, spec *v1.UpgradeSpec) error {
if targetSpec.Source != nil && targetSpec.Source.IsEmpty() {
return nil
}
size, err = GetSourceSize(cfg, targetSpec.Source)
if err != nil {
return err
@@ -817,9 +823,10 @@ func GetSourceSize(config *Config, source *v1.ImageSource) (int64, error) {
case source.IsFile():
file, err := config.Fs.Stat(source.Value())
if err == nil {
size = file.Size()
if err != nil {
return size, err
}
size = file.Size()
}
// Normalize size to Mb before returning and add 100Mb to round the size from bytes to mb+extra files like grub stuff
if size != 0 {