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

Commit aeac7c9

Browse files
ss75710541ss75710541
committed
fix: repo.GetAppDetails().Helm.GetParameterValueByName not get helm.values
1 parent 9b00bc2 commit aeac7c9

File tree

3 files changed

+65
-62
lines changed

3 files changed

+65
-62
lines changed

‎expr/shared/appdetail.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package shared
22

33
import (
4-
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
54
"github.com/argoproj/argo-cd/v2/reposerver/apiclient"
65
)
76

@@ -11,7 +10,7 @@ type AppDetail struct {
1110
// Ksonnet details
1211
Ksonnet *apiclient.KsonnetAppSpec
1312
// Helm details
14-
Helm *v1alpha1.ApplicationSourceHelm
13+
Helm *HelmAppSpec
1514
// Kustomize details
1615
Kustomize *apiclient.KustomizeAppSpec
1716
// Directory details

‎expr/shared/helmappspec.go

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@ import (
55
)
66

77
type HelmAppSpec struct {
8-
ASH *v1alpha1.ApplicationSourceHelm
8+
Name string
9+
ValueFiles []string
10+
Parameters []v1alpha1.HelmParameter
11+
Values string
12+
FileParameters []v1alpha1.HelmFileParameter
913
}
1014

1115
func (has HelmAppSpec) GetParameterValueByName(Name string) string {
1216
var value string
13-
for i := range has.ASH.Parameters {
14-
if has.ASH.Parameters[i].Name == Name {
15-
value = has.ASH.Parameters[i].Value
17+
for i := range has.Parameters {
18+
if has.Parameters[i].Name == Name {
19+
value = has.Parameters[i].Value
1620
break
1721
}
1822
}
@@ -21,9 +25,9 @@ func (has HelmAppSpec) GetParameterValueByName(Name string) string {
2125

2226
func (has HelmAppSpec) GetFileParameterPathByName(Name string) string {
2327
var path string
24-
for i := range has.ASH.FileParameters {
25-
if has.ASH.FileParameters[i].Name == Name {
26-
path = has.ASH.FileParameters[i].Path
28+
for i := range has.FileParameters {
29+
if has.FileParameters[i].Name == Name {
30+
path = has.FileParameters[i].Path
2731
break
2832
}
2933
}

‎shared/argocd/service.go

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -118,61 +118,61 @@ func (svc *argoCDService) GetAppDetails(ctx context.Context, appSource *v1alpha1
118118
if err != nil {
119119
return nil, err
120120
}
121-
//var has *shared.HelmAppSpec
122-
//if appDetail.Helm != nil {
123-
// if appSource.Helm.Parameters != nil {
124-
// for _, overrideParam := range appSource.Helm.Parameters {
125-
// for _, defaultParam := range appDetail.Helm.Parameters {
126-
// if overrideParam.Name == defaultParam.Name {
127-
// defaultParam.Value = overrideParam.Value
128-
// defaultParam.ForceString = overrideParam.ForceString
129-
// }
130-
// }
131-
// }
132-
// }
133-
//
134-
// if appSource.Helm.Values != "" {
135-
//
136-
// fmt.Printf("-------start output\n")
137-
// output := map[string]string{}
138-
// valuesMap := make(map[interface{}]interface{})
139-
// if err := yaml.Unmarshal([]byte(appSource.Helm.Values), valuesMap); err != nil {
140-
// return nil, fmt.Errorf("failed to parse : %s, appSource.Helm.Values: %v", err, appSource.Helm.Values)
141-
// }
142-
// flatVals(valuesMap, output)
143-
//
144-
// fmt.Printf("-------flatVals output\n")
145-
// //for i := range appDetail.Helm.Parameters {
146-
// // if v, ok := output[has.Parameters[i].Name]; ok {
147-
// // has.Parameters[i].Value = v
148-
// // //delete(output, has.Parameters[i].Name)
149-
// // break
150-
// // }
151-
// //}
152-
//
153-
// fmt.Printf("-------after delete output: %v\n", output)
154-
// for i := range appDetail.Helm.Parameters {
155-
// if v, ok := output[appDetail.Helm.Parameters[i].Name]; ok {
156-
// parameter := &v1alpha1.HelmParameter{Name: appDetail.Helm.Parameters[i].Name, Value: v}
157-
// appDetail.Helm.Parameters[i] = parameter
158-
// }
159-
// }
160-
//
161-
// fmt.Printf("-------appSource.Helm.Parameters: %v\n", appSource.Helm.Parameters)
162-
// fmt.Printf("-------appDetail.Helm.Parameters: %v\n", appDetail.Helm.Parameters)
163-
// }
164-
//
165-
// has = &shared.HelmAppSpec{
166-
// Name: appDetail.Helm.Name,
167-
// ValueFiles: appSource.Helm.ValueFiles,
168-
// Parameters: appDetail.Helm.Parameters,
169-
// Values: appSource.Helm.Values,
170-
// FileParameters: appDetail.Helm.FileParameters,
171-
// }
172-
//}
121+
var has *shared.HelmAppSpec
122+
if appDetail.Helm != nil {
123+
if appSource.Helm.Parameters != nil {
124+
for _, overrideParam := range appSource.Helm.Parameters {
125+
for _, defaultParam := range appDetail.Helm.Parameters {
126+
if overrideParam.Name == defaultParam.Name {
127+
defaultParam.Value = overrideParam.Value
128+
defaultParam.ForceString = overrideParam.ForceString
129+
}
130+
}
131+
}
132+
}
133+
134+
// if appSource.Helm.Values != "" {
135+
//
136+
// fmt.Printf("-------start output\n")
137+
// output := map[string]string{}
138+
// valuesMap := make(map[interface{}]interface{})
139+
// if err := yaml.Unmarshal([]byte(appSource.Helm.Values), valuesMap); err != nil {
140+
// return nil, fmt.Errorf("failed to parse : %s, appSource.Helm.Values: %v", err, appSource.Helm.Values)
141+
// }
142+
// flatVals(valuesMap, output)
143+
//
144+
// fmt.Printf("-------flatVals output\n")
145+
// //for i := range appDetail.Helm.Parameters {
146+
// // if v, ok := output[has.Parameters[i].Name]; ok {
147+
// // has.Parameters[i].Value = v
148+
// // //delete(output, has.Parameters[i].Name)
149+
// // break
150+
// // }
151+
// //}
152+
//
153+
// fmt.Printf("-------after delete output: %v\n", output)
154+
// for i := range appDetail.Helm.Parameters {
155+
// if v, ok := output[appDetail.Helm.Parameters[i].Name]; ok {
156+
// parameter := &v1alpha1.HelmParameter{Name: appDetail.Helm.Parameters[i].Name, Value: v}
157+
// appDetail.Helm.Parameters[i] = parameter
158+
// }
159+
// }
160+
//
161+
// fmt.Printf("-------appSource.Helm.Parameters: %v\n", appSource.Helm.Parameters)
162+
// fmt.Printf("-------appDetail.Helm.Parameters: %v\n", appDetail.Helm.Parameters)
163+
// }
164+
//
165+
has = &shared.HelmAppSpec{
166+
Name: appDetail.Helm.Name,
167+
ValueFiles: appSource.Helm.ValueFiles,
168+
Parameters: appSource.Helm.Parameters,
169+
Values: appSource.Helm.Values,
170+
FileParameters: appSource.Helm.FileParameters,
171+
}
172+
}
173173
return &shared.AppDetail{
174174
Type: appDetail.Type,
175-
Helm: appSource.Helm,
175+
Helm: has,
176176
Ksonnet: appDetail.Ksonnet,
177177
Kustomize: appDetail.Kustomize,
178178
Directory: appDetail.Directory,

0 commit comments

Comments
 (0)