Skip to content
This repository has been archived by the owner on Feb 7, 2024. It is now read-only.

Commit

Permalink
fix: repo.GetAppDetails().Helm.GetParameterValueByName not get helm.v…
Browse files Browse the repository at this point in the history
…alues
  • Loading branch information
ss75710541 committed Apr 27, 2022
1 parent 87a213e commit a3305aa
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions shared/argocd/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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,
}
}
Expand Down

0 comments on commit a3305aa

Please sign in to comment.