fix: repo.GetAppDetails().Helm.GetParameterValueByName not get helm.v…

…alues
argoproj-labs · Apr 27, 2022 · 4f54a6d · 4f54a6d
1 parent ebecda7
commit 4f54a6d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/shared/argocd/service.go b/shared/argocd/service.go
@@ -123,6 +123,9 @@ func (svc *argoCDService) GetAppDetails(ctx context.Context, appSource *v1alpha1
 	var has *shared.HelmAppSpec
 	if appDetail.Helm != nil {
 		paramsMap := map[string]*v1alpha1.HelmParameter{}
+		for _, param := range appDetail.Helm.Parameters {
+			paramsMap[param.Name] = param
+		}
 		if appSource.Helm.Parameters != nil {
 			for _, overrideParam := range appSource.Helm.Parameters {
 				paramsMap[overrideParam.Name] = &v1alpha1.HelmParameter{
@@ -133,9 +136,6 @@ func (svc *argoCDService) GetAppDetails(ctx context.Context, appSource *v1alpha1
 			}
 		}
 		if appSource.Helm.Values != "" {
-			for _, param := range appDetail.Helm.Parameters {
-				paramsMap[param.Name] = param
-			}
 			valuesParams, err := GetHelmParametersByValues(appSource.Helm.Values)
 			if err != nil {
 				return nil, err