From 35a8ce339d23ae3718af243bf584c126342ae90f Mon Sep 17 00:00:00 2001 From: Kjeld Schouten Date: Tue, 8 Apr 2025 08:48:48 +0200 Subject: [PATCH] fix(clustertool): revert dynamic trailing slash detection for now and fix jetstack --- .../embed/generic/root/repositories/helm/jetstack.yaml | 2 +- clustertool/pkg/fluxhandler/helm.go | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/clustertool/embed/generic/root/repositories/helm/jetstack.yaml b/clustertool/embed/generic/root/repositories/helm/jetstack.yaml index 83c1c61dc8e..fdbbceeb16e 100644 --- a/clustertool/embed/generic/root/repositories/helm/jetstack.yaml +++ b/clustertool/embed/generic/root/repositories/helm/jetstack.yaml @@ -8,4 +8,4 @@ metadata: spec: type: oci interval: 2h - url: oci://quay.io/jetstack/charts/ + url: oci://quay.io/jetstack/charts diff --git a/clustertool/pkg/fluxhandler/helm.go b/clustertool/pkg/fluxhandler/helm.go index 17cecb846e5..f54cb41dc1e 100644 --- a/clustertool/pkg/fluxhandler/helm.go +++ b/clustertool/pkg/fluxhandler/helm.go @@ -99,12 +99,7 @@ func HelmPull(repo string, name string, version string, dest string, silent bool updateHelmRepo(repoName, repo, silent) repo = repoName } else { - link := repo - if !strings.HasSuffix(repo, "/") { - link += "/" - } - link += name - client.RepoURL = "" + link = repo + "/" + name client.RepoURL = "" }