fix extra values when chart located in git repo

argoproj · Jul 29, 2021 · 2a7eab7 · 2a7eab7
1 parent 333c40f
commit 2a7eab7
Showing 1 changed file with 32 additions and 32 deletions.
diff --git a/reposerver/repository/repository.go b/reposerver/repository/repository.go
@@ -233,6 +233,38 @@ func (s *Service) runRepoOperation(
 		defer settings.sem.Release(1)
 	}
 
+	if source.Helm != nil && source.Helm.ExternalValueFiles != nil {
+		// load values files from external git repo
+		for _, exVal := range source.Helm.ExternalValueFiles {
+			exRepo := v1alpha1.Repository{Repo: exVal.RepoURL}
+			if helmExternalValueCreds != nil {
+				creds := getRepoCredential(helmExternalValueCreds, exVal.RepoURL)
+				if creds != nil {
+					exRepo.CopyCredentialsFrom(creds)
+				}
+			}
+
+			exGitClient, exRevision, err := s.newClientResolveRevision(&exRepo, exVal.TargetRevision, git.WithCache(s.cache, !settings.noRevisionCache && !settings.noCache))
+			if err != nil {
+				return err
+			}
+
+			err = DoGitCheckoutOperationForRepoOperation(
+				s,
+				exGitClient,
+				exRevision,
+				settings,
+				cacheFn,
+				nil,
+				verifyCommit,
+				"",
+			)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
 	if source.IsHelm() {
 		if settings.noCache {
 			err = helmClient.CleanChartCache(source.Chart, revision)
@@ -246,38 +278,6 @@ func (s *Service) runRepoOperation(
 		}
 		defer io.Close(closer)
 
-		if source.Helm != nil && source.Helm.ExternalValueFiles != nil {
-			// load values files from external git repo
-			for _, exVal := range source.Helm.ExternalValueFiles {
-				exRepo := v1alpha1.Repository{Repo: exVal.RepoURL}
-				if helmExternalValueCreds != nil {
-					creds := getRepoCredential(helmExternalValueCreds, exVal.RepoURL)
-					if creds != nil {
-						exRepo.CopyCredentialsFrom(creds)
-					}
-				}
-
-				exGitClient, exRevision, err := s.newClientResolveRevision(&exRepo, exVal.TargetRevision, git.WithCache(s.cache, !settings.noRevisionCache && !settings.noCache))
-				if err != nil {
-					return err
-				}
-
-				err = DoGitCheckoutOperationForRepoOperation(
-					s,
-					exGitClient,
-					exRevision,
-					settings,
-					cacheFn,
-					nil,
-					verifyCommit,
-					"",
-				)
-				if err != nil {
-					return err
-				}
-			}
-		}
-
 		return operation(chartPath, revision, revision, func() (*operationContext, error) {
 			return &operationContext{chartPath, ""}, nil
 		})