fix: adds snapshot to helm config

Author: faiq

charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml

@@ -20,6 +20,10 @@ data:
     defaultChartName: node-feature-discovery
     defaultChartVersion: 0.15.2
     defaultRepositoryUrl: https://kubernetes-sigs.github.io/node-feature-discovery/charts
+  nutanix-snapshot-csi: |
+    defaultChartName: nutanix-csi-snapshot
+    defaultChartVersion: v6.3.2
+    defaultRepositoryUrl: https://nutanix.github.io/helm/
   nutanix-storage-csi: |
     defaultChartName: nutanix-csi-storage
     defaultChartVersion: v2.6.6

hack/addons/kustomize/nutanix-snapshot-csi/kustomization.yaml.tmpl

@@ -0,0 +1,19 @@
+# Copyright 2023 D2iQ, Inc. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+metadata:
+  name: nutanix-csi-kustomize
+
+namespace: kube-system
+
+helmCharts:
+- name: nutanix-csi-snapshot
+  repo: https://nutanix.github.io/helm/
+  releaseName: nutanix-csi-storage
+  version: ${NUTANIX_SNAPSHOT_CSI_CHART_VERSION}
+  includeCRDs: true
+  skipTests: true
+  namespace: nutanix-system

make/addons.mk

@@ -8,6 +8,7 @@ export CLUSTER_AUTOSCALER_VERSION := 9.35.0
 export AWS_CSI_SNAPSHOT_CONTROLLER_VERSION := v6.3.3
 export AWS_EBS_CSI_CHART_VERSION := v2.28.1
 export NUTANIX_STORAGE_CSI_CHART_VERSION := v2.6.6
+export NUTANIX_SNAPSHOT_CSI_CHART_VERSION := v6.3.2
 # a map of AWS CCM versions
 export AWS_CCM_VERSION_127 := v1.27.1
 export AWS_CCM_CHART_VERSION_127 := 0.0.8

pkg/handlers/generic/lifecycle/config/cm.go

@@ -17,11 +17,12 @@ import (
 type Component string
 
 const (
-	Autoscaler        Component = "cluster-autoscaler"
-	Tigera            Component = "tigera-operator"
-	Cilium            Component = "cilium"
-	NFD               Component = "nfd"
-	NutanixStorageCSI Component = "nutanix-storage-csi"
+	Autoscaler         Component = "cluster-autoscaler"
+	Tigera             Component = "tigera-operator"
+	Cilium             Component = "cilium"
+	NFD                Component = "nfd"
+	NutanixStorageCSI  Component = "nutanix-storage-csi"
+	NutanixSnapshotCSI Component = "nutanix-snapshot-csi"
 )
 
 type HelmChartGetter struct {

pkg/handlers/generic/lifecycle/csi/nutanix-csi/handler.go

@@ -26,11 +26,8 @@ import (
 )
 
 const (
-	defaultHelmRepositoryURL              = "https://nutanix.github.io/helm/"
 	defaultStorageHelmReleaseNameTemplate = "nutanix-csi-storage-%s"
 
-	defaultSnapshotHelmChartVersion        = "v6.3.2"
-	defaultSnapshotHelmChartName           = "nutanix-csi-snapshot"
 	defaultSnapshotHelmReleaseNameTemplate = "nutanix-csi-snapshot-%s"
 )
 
@@ -178,6 +175,11 @@ func (n *NutanixCSI) handleHelmAddonApply(
 		return fmt.Errorf("failed to apply nutanix-csi installation HelmChartProxy: %w", err)
 	}
 
+	snapshotHelmChart, err := n.helmChartInfoGetter.For(ctx, log, config.NutanixSnapshotCSI)
+	if err != nil {
+		return fmt.Errorf("failed to get values for nutanix-csi-config %w", err)
+	}
+
 	snapshotChart := &caaphv1.HelmChartProxy{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: caaphv1.GroupVersion.String(),
@@ -188,14 +190,14 @@ func (n *NutanixCSI) handleHelmAddonApply(
 			Name:      "nutanix-csi-snapshot" + req.Cluster.Name,
 		},
 		Spec: caaphv1.HelmChartProxySpec{
-			RepoURL:   defaultHelmRepositoryURL,
-			ChartName: defaultSnapshotHelmChartName,
+			RepoURL:   snapshotHelmChart.Repository,
+			ChartName: snapshotHelmChart.Name,
 			ClusterSelector: metav1.LabelSelector{
 				MatchLabels: map[string]string{clusterv1.ClusterNameLabel: req.Cluster.Name},
 			},
 			ReleaseNamespace: req.Cluster.Namespace,
 			ReleaseName:      fmt.Sprintf(defaultSnapshotHelmReleaseNameTemplate, req.Cluster.Name),
-			Version:          defaultSnapshotHelmChartVersion,
+			Version:          snapshotHelmChart.Version,
 		},
 	}
 

test/helpers/envtest.go

@@ -52,7 +52,7 @@ type TestEnvironment struct {
 	client.Client
 	Config *rest.Config
 	env    *envtest.Environment
-	_      context.CancelFunc
+	cancel context.CancelFunc
 }
 
 // Cleanup deletes all the given objects.