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

fix: pass talos endpoints during bootstrap

Browse source
This commit is contained in:
eding 2026-07-20 22:05:29 +02:00
parent ea732ebded
commit d16442862e
4 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/bootstrap/bootstrap.go
View file

@ -61,10 +61,10 @@ func (r Runner) Run() error {
} }
} }
if r.Config.Talos.AutoBootstrap { if r.Config.Talos.AutoBootstrap {
if err := utils.RunCommandInDir(generatedDir, "talosctl", "bootstrap", "--talosconfig=./clusterconfig/talosconfig", "--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
} }
if err := utils.RunCommandInDir(generatedDir, "talosctl", "kubeconfig", "--talosconfig=./clusterconfig/talosconfig", "--nodes="+r.Config.Talos.KubeconfigNode, "."); err != nil { if err := utils.RunCommandInDir(generatedDir, "talosctl", "kubeconfig", "--talosconfig=./clusterconfig/talosconfig", "--endpoints="+r.Config.Talos.KubeconfigEndpoint, "--nodes="+r.Config.Talos.KubeconfigNode, "."); err != nil {
return err return err
} }
} }

6
internal/config/config.go
View file

@ -78,6 +78,12 @@ func applyDefaults(cfg *Config) {
if cfg.Talos.Image.Architecture == "" { if cfg.Talos.Image.Architecture == "" {
cfg.Talos.Image.Architecture = "amd64" cfg.Talos.Image.Architecture = "amd64"
} }
if cfg.Talos.BootstrapEndpoint == "" {
cfg.Talos.BootstrapEndpoint = cfg.Talos.BootstrapNode
}
if cfg.Talos.KubeconfigEndpoint == "" {
cfg.Talos.KubeconfigEndpoint = cfg.Talos.KubeconfigNode
}
} }
func Validate(cfg Config) error { func Validate(cfg Config) error {

28
internal/config/types.go
View file

@ -35,19 +35,21 @@ type TemplateConfig struct {
} }
type TalosConfig struct { type TalosConfig struct {
RepoDirName string `yaml:"repoDirName"` RepoDirName string `yaml:"repoDirName"`
TerraformDir string `yaml:"terraformDir"` TerraformDir string `yaml:"terraformDir"`
GeneratedDir string `yaml:"generatedDir"` GeneratedDir string `yaml:"generatedDir"`
ConfigFileName string `yaml:"configFileName"` ConfigFileName string `yaml:"configFileName"`
AutoRunTerraform bool `yaml:"autoRunTerraform"` AutoRunTerraform bool `yaml:"autoRunTerraform"`
AutoBootstrap bool `yaml:"autoBootstrap"` AutoBootstrap bool `yaml:"autoBootstrap"`
AutoBootstrapFlux bool `yaml:"autoBootstrapFlux"` AutoBootstrapFlux bool `yaml:"autoBootstrapFlux"`
BootstrapNode string `yaml:"bootstrapNode"` BootstrapNode string `yaml:"bootstrapNode"`
KubeconfigNode string `yaml:"kubeconfigNode"` BootstrapEndpoint string `yaml:"bootstrapEndpoint"`
Proxmox TalosProxmoxConfig `yaml:"proxmox"` KubeconfigNode string `yaml:"kubeconfigNode"`
Cluster TalosClusterConfig `yaml:"cluster"` KubeconfigEndpoint string `yaml:"kubeconfigEndpoint"`
Image TalosImageConfig `yaml:"image"` Proxmox TalosProxmoxConfig `yaml:"proxmox"`
Nodes []TalosNode `yaml:"nodes"` Cluster TalosClusterConfig `yaml:"cluster"`
Image TalosImageConfig `yaml:"image"`
Nodes []TalosNode `yaml:"nodes"`
} }
type TalosProxmoxConfig struct { type TalosProxmoxConfig struct {

2
internal/ui/wizard.go
View file

@ -87,7 +87,9 @@ func RunBootstrapWizard(initial config.Config) (config.Config, error) {
nodePreset := prompt(reader, "Cluster size preset (single/ha/custom)", "single") nodePreset := prompt(reader, "Cluster size preset (single/ha/custom)", "single")
cfg.Talos.Nodes = buildNodes(reader, cfg, discovered, nodePreset) cfg.Talos.Nodes = buildNodes(reader, cfg, discovered, nodePreset)
cfg.Talos.BootstrapNode = cfg.Talos.Nodes[0].Networks[0].IP cfg.Talos.BootstrapNode = cfg.Talos.Nodes[0].Networks[0].IP
cfg.Talos.BootstrapEndpoint = cfg.Talos.BootstrapNode
cfg.Talos.KubeconfigNode = cfg.Talos.Nodes[0].Networks[0].IP cfg.Talos.KubeconfigNode = cfg.Talos.Nodes[0].Networks[0].IP
cfg.Talos.KubeconfigEndpoint = cfg.Talos.KubeconfigNode
return cfg, nil return cfg, nil
} }