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

Merge pull request 'fix: read Cilium version from workspace' (#21) from fix/cilium-version-workspace-path into main

Browse source 
Reviewed-on: #21
This commit is contained in:
eding 2026-08-31 18:52:49 +02:00
parent 8e8f80e06f 3f903afd13
commit 5e98336cdf
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/bootstrap/bootstrap.go
View file

@ -313,7 +313,7 @@ func (r Runner) Run() error {
}
}
if r.Config.Talos.AutoBootstrapFlux {
if err := installCilium(generatedDir, r.Config); err != nil {
if err := installCilium(generatedDir, filepath.Join(repoDir, "base", "cilium", "release.yaml"), r.Config); err != nil {
return err
}
if err := utils.RunCommandInDirEnv(generatedDir, []string{"GIT_PASSWORD=" + r.Config.Git.Token}, "flux", "bootstrap", "git", "--url="+forgejo.CloneURL(r.Config.Git.BaseURL, r.Config.Git.Owner, r.Config.Flux.RepoName), "--branch="+r.Config.Flux.Branch, "--path="+r.Config.Flux.ClusterPath, "--cluster-domain="+r.Config.Flux.ClusterDomain, "--username="+r.Config.Git.Username, "--token-auth", "--kubeconfig=kubeconfig"); err != nil {
@ -1142,13 +1142,13 @@ func ensureManifestsKustomizations(dir string) error {
return nil
}
func installCilium(dir string, cfg config.Config) error {
func installCilium(dir, releasePath string, cfg config.Config) error {
helmDir := filepath.Join(dir, ".helm")
if err := os.MkdirAll(helmDir, 0755); err != nil {
return err
}
// The generated HelmRelease is the sole Cilium chart-version authority.
version, err := ciliumChartVersion(filepath.Join(dir, "base", "cilium", "release.yaml"))
version, err := ciliumChartVersion(releasePath)
if err != nil {
return err
}