diff --git a/shared/argocd/service.go b/shared/argocd/service.go index e634dcf3..7677dcd8 100644 --- a/shared/argocd/service.go +++ b/shared/argocd/service.go @@ -123,17 +123,13 @@ func (svc *argoCDService) GetAppDetails(ctx context.Context, appSource *v1alpha1 return nil, err } - fmt.Sprintf("----- appSource.Helm.Marshal data: %v", data) + fmt.Sprintf("----- appSource: %v", appSource) appDetail.Helm.Unmarshal(data) - fmt.Sprintf("----- appDetail.Helm data: %v", appDetail.Helm) - + fmt.Sprintf("----- appDetail: %v", appDetail) + var has *shared.HelmAppSpec if appDetail.Helm != nil { - - fmt.Sprintf(" ------- appSource.Helm.Parameters: %v\n", appSource.Helm.Parameters) - fmt.Sprintf(" ------- appDetail.Helm.Parameters: %v\n", appDetail.Helm.Parameters) - if appSource.Helm.Parameters != nil { for _, overrideParam := range appSource.Helm.Parameters { for _, defaultParam := range appDetail.Helm.Parameters { @@ -172,12 +168,11 @@ func (svc *argoCDService) GetAppDetails(ctx context.Context, appSource *v1alpha1 // fmt.Printf("-------appSource.Helm.Parameters: %v\n", appSource.Helm.Parameters) // fmt.Printf("-------appDetail.Helm.Parameters: %v\n", appDetail.Helm.Parameters) //} - has = &shared.HelmAppSpec{ Name: appDetail.Helm.Name, ValueFiles: appDetail.Helm.ValueFiles, Parameters: appDetail.Helm.Parameters, - Values: appSource.Helm.Values, + Values: appDetail.Helm.Values, FileParameters: appDetail.Helm.FileParameters, } }