Skip to content

Commit

Permalink
fix: better error messages (#477)
Browse files Browse the repository at this point in the history
related to: kairos-io/kairos#1797

Signed-off-by: mudler <mudler@localai.io>
  • Loading branch information
mudler authored Dec 12, 2023
1 parent f04f9b7 commit f71257e
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions internal/role/p2p/master.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,13 @@ func Master(cc *config.Config, pconfig *providerConfig.Config, clusterInit, ha b

svc, err := machine.K3s()
if err != nil {
return err
return fmt.Errorf("failed to get k3s service: %w", err)
}

if err := utils.WriteEnv(machine.K3sEnvUnit("k3s"),
env,
); err != nil {
return err
return fmt.Errorf("failed to write the k3s service: %w", err)
}

args := genArgs(pconfig, ip, ifaceIP)
Expand Down Expand Up @@ -207,23 +207,27 @@ func Master(cc *config.Config, pconfig *providerConfig.Config, clusterInit, ha b
}

if err := svc.OverrideCmd(fmt.Sprintf("%s server %s", k3sbin, strings.Join(args, " "))); err != nil {
return err
return fmt.Errorf("failed to override k3s command: %w", err)
}

if err := svc.Start(); err != nil {
return err
return fmt.Errorf("failed to start k3s service: %w", err)
}

if err := svc.Enable(); err != nil {
return err
return fmt.Errorf("failed to enable k3s service: %w", err)
}

if err := propagateMasterData(ip, c, clusterInit, ha, roleName); err != nil {
return err
return fmt.Errorf("failed to propagate master data: %w", err)
}

utils.SH(fmt.Sprintf("kairos-agent run-stage provider-kairos.bootstrap.after.%s", roleName)) //nolint:errcheck

return role.CreateSentinel()
if err := role.CreateSentinel(); err != nil {
return fmt.Errorf("failed to create sentinel: %w", err)
}

return nil
}
}

0 comments on commit f71257e

Please sign in to comment.