From 3f903afd131efcb0e3e01a84cc8c30b80340e9b2 Mon Sep 17 00:00:00 2001 From: eding Date: Mon, 31 Aug 2026 18:49:27 +0200 Subject: [PATCH] fix: read Cilium version from workspace --- internal/bootstrap/bootstrap.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/bootstrap/bootstrap.go b/internal/bootstrap/bootstrap.go index 4ba0cae..35621a4 100644 --- a/internal/bootstrap/bootstrap.go +++ b/internal/bootstrap/bootstrap.go @@ -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 } -- 2.43.7