Skip to content

Commit

Permalink
ineff assignment according to linter
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Strang committed Feb 7, 2024
1 parent 82017ad commit fb6a29a
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions pkg/argocd/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -453,20 +453,10 @@ func marshalParamsOverride(app *v1alpha1.Application, originalData []byte) ([]by
return nil, fmt.Errorf("%s parameter not found", helmAnnotationParamVersion)
}
newValues[helmAnnotationParamVersion] = helmParamVersion.Value

// Build string with YAML format to merge with originalData values
// helmValues := fmt.Sprintf("%s: %s\n%s: %s", helmAnnotationParamName, helmParamName.Value, helmAnnotationParamVersion, helmParamVersion.Value)

// var mergedParams *conflate.Conflate
// mergedParams, err = conflate.FromData(originalData, []byte(helmValues))
// if err != nil {
// return nil, err
// }

// override, err = mergedParams.MarshalYAML()
}

mergeHelmValues(values, newValues)
override, err = yaml.Marshal(values)
override, _ = yaml.Marshal(values)
} else {
var params helmOverride
newParams := helmOverride{
Expand Down

0 comments on commit fb6a29a

Please sign in to comment.