Skip to content
This repository was archived by the owner on Oct 19, 2024. It is now read-only.

Commit a3305aa

Browse files
committed
fix: repo.GetAppDetails().Helm.GetParameterValueByName not get helm.values
1 parent 87a213e commit a3305aa

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

shared/argocd/service.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,17 +123,13 @@ func (svc *argoCDService) GetAppDetails(ctx context.Context, appSource *v1alpha1
123123
return nil, err
124124
}
125125

126-
fmt.Sprintf("----- appSource.Helm.Marshal data: %v", data)
126+
fmt.Sprintf("----- appSource: %v", appSource)
127127

128128
appDetail.Helm.Unmarshal(data)
129-
fmt.Sprintf("----- appDetail.Helm data: %v", appDetail.Helm)
130-
129+
fmt.Sprintf("----- appDetail: %v", appDetail)
130+
131131
var has *shared.HelmAppSpec
132132
if appDetail.Helm != nil {
133-
134-
fmt.Sprintf(" ------- appSource.Helm.Parameters: %v\n", appSource.Helm.Parameters)
135-
fmt.Sprintf(" ------- appDetail.Helm.Parameters: %v\n", appDetail.Helm.Parameters)
136-
137133
if appSource.Helm.Parameters != nil {
138134
for _, overrideParam := range appSource.Helm.Parameters {
139135
for _, defaultParam := range appDetail.Helm.Parameters {
@@ -172,12 +168,11 @@ func (svc *argoCDService) GetAppDetails(ctx context.Context, appSource *v1alpha1
172168
// fmt.Printf("-------appSource.Helm.Parameters: %v\n", appSource.Helm.Parameters)
173169
// fmt.Printf("-------appDetail.Helm.Parameters: %v\n", appDetail.Helm.Parameters)
174170
//}
175-
176171
has = &shared.HelmAppSpec{
177172
Name: appDetail.Helm.Name,
178173
ValueFiles: appDetail.Helm.ValueFiles,
179174
Parameters: appDetail.Helm.Parameters,
180-
Values: appSource.Helm.Values,
175+
Values: appDetail.Helm.Values,
181176
FileParameters: appDetail.Helm.FileParameters,
182177
}
183178
}

0 commit comments

Comments
 (0)