From 1e5b8bb721907a1444a44729d3e22f1ce53b106a Mon Sep 17 00:00:00 2001 From: Dimitri Koshkin Date: Tue, 16 Apr 2024 18:53:02 -0700 Subject: [PATCH] Revert "refactor: template NFD image with .Chart.Version" This reverts commit 718a4ad732d19ef0eee1961f5957d5ecd9c04ed6. --- .../templates/nfd/manifests/helm-addon-installation.yaml | 2 -- pkg/handlers/generic/lifecycle/nfd/strategy_helmaddon.go | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) 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 index 8163657cf..6f3cc6859 100644 --- 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 index c86946969..3265096a1 100644 --- 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(),