rancher/immucore
1
0
Fork 0
mirror of https://github.com/kairos-io/immucore.git synced 2025-09-03 23:54:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Full rework (#41)

Browse Source 
* Full rework

 - Extract steps to a different file
 - Simplify dag for easy understanding
 - Load dag based on our boot process
 - Simplify steps to not depend on useless stuff
 - Better logging

Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com>

* Move sentinel file to the dag

Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com>

* Adapt tests

Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com>

---------

Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com>
This commit is contained in:
Itxaka
2023-02-15 22:30:08 +01:00
committed by GitHub
parent 4e2dd37e70
commit ad014e9f22
16 changed files with 793 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
internal/cmd/commands.go
View File

@@ -39,38 +39,22 @@ Sends a generic event payload with the configuration found in the scanned direct
zerolog.SetGlobalLevel(zerolog.DebugLevel)
}
g := herd.DAG(herd.EnableInit)
// You can pass rd.cos.disable in the cmdline to disable the whole immutable stuff
if len(utils.ReadCMDLineArg("rd.cos.disable")) > 0 {
log.Logger.Info().Msg("Stanza rd.cos.disable on the cmdline. Doing nothing.")
return nil
}
// First set the sentinel file.
if !c.Bool("dry-run") {
err = utils.SetSentinelFile()
if err != nil {
log.Logger.Err(err).Send()
return err
}
}
cdBoot, err := utils.BootedFromLiveMedia()
if err != nil {
log.Logger.Err(err).Send()
return err
}
cosDisable := len(utils.ReadCMDLineArg("rd.cos.disable")) > 0
img := utils.ReadCMDLineArg("cos-img/filename=")
if len(img) == 0 {
// If we boot from LIVE media or are using dry-run, we use a fake img as we still want to do things
if c.Bool("dry-run") || cdBoot {
if c.Bool("dry-run") || cosDisable {
img = []string{"fake"}
} else {
log.Logger.Fatal().Msg("Could not get the image name from cmdline (i.e. cos-img/filename=/cOS/active.img)")
}
}
log.Debug().Strs("TargetImage", img).Msg("Target image")
g := herd.DAG(herd.EnableInit)
s := &mount.State{
Logger: log.Logger,
Rootdir: utils.GetRootDir(),
@@ -79,7 +63,13 @@ Sends a generic event payload with the configuration found in the scanned direct
TargetImage: img[0],
}
err = s.Register(g)
if cosDisable {
log.Logger.Info().Msg("Stanza rd.cos.disable on the cmdline.")
err = s.RegisterLiveMedia(g)
} else {
err = s.RegisterNormalBoot(g)
}
if err != nil {
s.Logger.Err(err)
return err
@@ -88,7 +78,7 @@ Sends a generic event payload with the configuration found in the scanned direct
log.Info().Msg(s.WriteDAG(g))
if c.Bool("dry-run") {
return err
return nil
}
err = g.Run(context.Background())
@@ -97,17 +87,3 @@ Sends a generic event payload with the configuration found in the scanned direct
},
},
}
func writeDag(d [][]herd.GraphEntry) {
for i, layer := range d {
log.Printf("%d.", (i + 1))
for _, op := range layer {
if op.Error != nil {
log.Printf(" <%s> (error: %s) (background: %t) (weak: %t)", op.Name, op.Error.Error(), op.Background, op.WeakDeps)
} else {
log.Printf(" <%s> (background: %t) (weak: %t)", op.Name, op.Background, op.WeakDeps)
}
}
log.Print("")
}
}