refactor: template NFD image with .Chart.Version

nutanix-cloud-native · Apr 16, 2024 · 718a4ad · 718a4ad
1 parent 20f3e42
commit 718a4ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/...uster-api-runtime-extensions-nutanix/templates/nfd/manifests/helm-addon-installation.yaml b/...uster-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(),