Merge pull request #62 from brandond/fix_chartcontent

brandond · web-flow · commit 02adbd18d6dd · 2020-08-21T10:49:04.000-07:00
Use correct field as source for ChartContent ConfigMap
diff --git a/pkg/helm/controller.go b/pkg/helm/controller.go
@@ -437,7 +437,7 @@ func contentConfigMap(chart *helmv1.HelmChart) *core.ConfigMap {
 
 	if chart.Spec.ChartContent != "" {
 		key := fmt.Sprintf("%s.tgz.base64", chart.Name)
-		configMap.Data[key] = chart.Spec.ValuesContent
+		configMap.Data[key] = chart.Spec.ChartContent
 	}
 
 	return configMap

Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,7 @@ func contentConfigMap(chart helmv1.HelmChart) core.ConfigMap {`
`437`	`437`
`438`	`438`	`if chart.Spec.ChartContent != "" {`
`439`	`439`	`key := fmt.Sprintf("%s.tgz.base64", chart.Name)`
`440`		`- configMap.Data[key] = chart.Spec.ValuesContent`
	`440`	`+ configMap.Data[key] = chart.Spec.ChartContent`
`441`	`441`	`}`
`442`	`442`
`443`	`443`	`return configMap`