Revert "refactor: template NFD image with .Chart.Version"

dkoshkin · dkoshkin · commit 1e5b8bb72190 · 2024-04-16T18:53:02.000-07:00
This reverts commit 718a4ad.
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,8 +8,6 @@ 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
@@ -66,6 +66,12 @@ 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
`@@ -66,6 +66,12 @@ func (s helmAddonStrategy) apply(`
`66`	`66`	`)`
`67`	`67`	`}`
`68`	`68`
	`69`	`+ values := valuesTemplateConfigMap.Data["values.yaml"]`
	`70`	+ values += fmt.Sprintf(`
	`71`	`+image:`
	`72`	`+ tag: v%s-minimal`
	`73`	+`, s.helmChart.Version)
	`74`	`+`
`69`	`75`	`hcp := &caaphv1.HelmChartProxy{`
`70`	`76`	`TypeMeta: metav1.TypeMeta{`
`71`	`77`	`APIVersion: caaphv1.GroupVersion.String(),`