fix: support loading oci helm dependencies referenced by chart stored…

… in non-oci repo (argoproj#5917) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
bainss · Mar 30, 2021 · d085636 · d085636
1 parent 75a1ea0
commit d085636
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/util/helm/helm.go b/util/helm/helm.go
@@ -67,16 +67,19 @@ func (h *helm) Template(templateOpts *TemplateOpts) (string, error) {
 }
 
 func (h *helm) DependencyBuild() error {
-	for _, repo := range h.repos {
+	isHelmOci := h.cmd.IsHelmOci
+	defer func() {
+		h.cmd.IsHelmOci = isHelmOci
+	}()
+
+	for i := range h.repos {
+		repo := h.repos[i]
 		if repo.EnableOci {
 			h.cmd.IsHelmOci = true
 			_, err := h.cmd.Login(repo.Repo, repo.Creds)
-			h.cmd.IsHelmOci = false
 
 			defer func() {
-				h.cmd.IsHelmOci = true
 				_, _ = h.cmd.Logout(repo.Repo, repo.Creds)
-				h.cmd.IsHelmOci = false
 			}()
 
 			if err != nil {