Maidn/maidn-cli
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix: wait for talos installer reboot

Browse source
This commit is contained in:
eding 2026-07-21 23:05:40 +02:00
parent 795a6038f2
commit 64e9a6a7d9
2 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
internal/bootstrap/bootstrap.go
View file

@ -5,6 +5,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
"time"
"github.com/Pingu-Studio/MaidnCLI/internal/config" "github.com/Pingu-Studio/MaidnCLI/internal/config"
"github.com/Pingu-Studio/MaidnCLI/internal/forgejo" "github.com/Pingu-Studio/MaidnCLI/internal/forgejo"
@ -70,6 +71,9 @@ func (r Runner) Run() error {
if err := utils.RunCommandInDir(generatedDir, "talosctl", "apply-config", "--insecure", "--nodes="+r.Config.Talos.BootstrapNode, "--endpoints="+r.Config.Talos.BootstrapEndpoint, "--file="+configFile); err != nil { if err := utils.RunCommandInDir(generatedDir, "talosctl", "apply-config", "--insecure", "--nodes="+r.Config.Talos.BootstrapNode, "--endpoints="+r.Config.Talos.BootstrapEndpoint, "--file="+configFile); err != nil {
return err return err
} }
if err := waitForTalosReboot(generatedDir, r.Config); err != nil {
return err
}
if err := utils.RunCommandInDir(generatedDir, "talosctl", "bootstrap", "--talosconfig=./clusterconfig/talosconfig", "--endpoints="+r.Config.Talos.BootstrapEndpoint, "--nodes="+r.Config.Talos.BootstrapNode); err != nil { if err := utils.RunCommandInDir(generatedDir, "talosctl", "bootstrap", "--talosconfig=./clusterconfig/talosconfig", "--endpoints="+r.Config.Talos.BootstrapEndpoint, "--nodes="+r.Config.Talos.BootstrapNode); err != nil {
return err return err
} }
@ -85,6 +89,21 @@ func (r Runner) Run() error {
return nil return nil
} }
func waitForTalosReboot(dir string, cfg config.Config) error {
deadline := time.Now().Add(2 * time.Minute)
offline := false
for time.Now().Before(deadline) {
err := utils.RunCommandQuietInDir(dir, "talosctl", "get", "machinestatus", "--talosconfig=./clusterconfig/talosconfig", "--endpoints="+cfg.Talos.BootstrapEndpoint, "--nodes="+cfg.Talos.BootstrapNode)
if err != nil {
offline = true
} else if offline {
return nil
}
time.Sleep(2 * time.Second)
}
return fmt.Errorf("Talos API did not return after applying its machine configuration")
}
func ensureRepo(dir, repoURL, ref string) error { func ensureRepo(dir, repoURL, ref string) error {
if _, err := os.Stat(dir); os.IsNotExist(err) { if _, err := os.Stat(dir); os.IsNotExist(err) {
return utils.RunCommand("git", "clone", "--branch", ref, repoURL, dir) return utils.RunCommand("git", "clone", "--branch", ref, repoURL, dir)

6
internal/utils/helpers.go
View file

@ -44,6 +44,12 @@ func RunCommandInDir(dir string, name string, args ...string) error {
return cmd.Run() return cmd.Run()
} }
func RunCommandQuietInDir(dir string, name string, args ...string) error {
cmd := exec.Command(name, args...)
cmd.Dir = dir
return cmd.Run()
}
func RunCommandOutput(name string, args ...string) ([]byte, error) { func RunCommandOutput(name string, args ...string) ([]byte, error) {
cmd := exec.Command(name, args...) cmd := exec.Command(name, args...)
var stdout bytes.Buffer var stdout bytes.Buffer