refactor: template NFD image with .Chart.Version

dkoshkin · dkoshkin · commit 718a4ad732d1 · 2024-04-16T16:47:45.000-07:00
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/helm-addon-installation.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/helm-addon-installation.yaml
@@ -8,6 +8,8 @@ metadata:
   name: '{{ .Values.hooks.nfd.helmAddonStrategy.defaultValueTemplateConfigMap.name }}'
 data:
   values.yaml: |-
+    image:
+      tag: v{{ .Chart.Version }}-minimal
     master:
       extraLabelNs:
         - nvidia.com
diff --git a/pkg/handlers/generic/lifecycle/nfd/strategy_helmaddon.go b/pkg/handlers/generic/lifecycle/nfd/strategy_helmaddon.go
@@ -61,12 +61,6 @@ func (s helmAddonStrategy) apply(
 		)
 	}
 
-	values := valuesTemplateConfigMap.Data["values.yaml"]
-	values += fmt.Sprintf(`
-image:
-  tag: v%s-minimal
-`, s.helmChart.Version)
-
 	hcp := &caaphv1.HelmChartProxy{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: caaphv1.GroupVersion.String(),

Original file line number	Diff line number	Diff line change
`@@ -61,12 +61,6 @@ func (s helmAddonStrategy) apply(`
`61`	`61`	`)`
`62`	`62`	`}`
`63`	`63`
`64`		`- values := valuesTemplateConfigMap.Data["values.yaml"]`
`65`		- values += fmt.Sprintf(`
`66`		`-image:`
`67`		`- tag: v%s-minimal`
`68`		-`, s.helmChart.Version)
`69`		`-`
`70`	`64`	`hcp := &caaphv1.HelmChartProxy{`
`71`	`65`	`TypeMeta: metav1.TypeMeta{`
`72`	`66`	`APIVersion: caaphv1.GroupVersion.String(),`