kairos/provider-kairos
1
0
Fork 0
mirror of https://github.com/kairos-io/provider-kairos.git synced 2025-04-27 19:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run bootstrap if k0s config is present (#681)

Browse Source 
And read args from both k3s or k0s

Signed-off-by: Mauro Morales <contact@mauromorales.com>
This commit is contained in:
Mauro Morales 2025-01-24 16:18:27 +01:00 committed by GitHub
parent 5b9bdda87d
commit 2ec8886731
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/provider/bootstrap.go
View File

@ -48,8 +48,8 @@ func Bootstrap(e *pluggable.Event) pluggable.EventResponse {
tokenNotDefined := (p2pBlockDefined && prvConfig.P2P.NetworkToken == "") || !p2pBlockDefined
skipAuto := p2pBlockDefined && !prvConfig.P2P.Auto.IsEnabled()
if prvConfig.P2P == nil && !prvConfig.K3s.Enabled && !prvConfig.K3sAgent.Enabled {
return pluggable.EventResponse{State: fmt.Sprintf("no kairos or k3s configuration. nothing to do: %s", cfg.Config)}
if prvConfig.P2P == nil && !prvConfig.IsAKubernetesDistributionEnabled() {
return pluggable.EventResponse{State: fmt.Sprintf("no kubernetes distribution configuration. nothing to do: %s", cfg.Config)}
}
utils.SH("kairos-agent run-stage kairos-agent.bootstrap") //nolint:errcheck
@ -168,7 +168,7 @@ func oneTimeBootstrap(l types.KairosLogger, c *providerConfig.Config, vpnSetupFN
var svcName, svcRole, envFile, binPath string
var svcEnv map[string]string
if !c.IsK3sDistributionEnabled() {
if !c.IsAKubernetesDistributionEnabled() {
l.Info("No Kubernetes configuration found, skipping bootstrap.")
return nil
}
@ -232,8 +232,16 @@ func oneTimeBootstrap(l types.KairosLogger, c *providerConfig.Config, vpnSetupFN
return fmt.Errorf("could not detect OS")
}
// Args can come from k3s or k0s
var args string
if c.IsK3sDistributionEnabled() {
args = strings.Join(c.K3s.Args, " ")
} else if c.IsK0sDistributionEnabled() {
args = strings.Join(c.K0s.Args, " ")
}
// Override the service command and start it
if err := svc.OverrideCmd(fmt.Sprintf("%s %s %s", binPath, svcRole, strings.Join(c.K3s.Args, " "))); err != nil {
if err := svc.OverrideCmd(fmt.Sprintf("%s %s %s", binPath, svcRole, args)); err != nil {
l.Errorf("Failed to override service command: %s", err.Error())
return err
}