feat: add helm chart field

Author: faiq

api/v1alpha1/addon_types.go

@@ -9,6 +9,7 @@ import (
 	"k8s.io/utils/ptr"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
+	"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/openapi/patterns"
 	"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/variables"
 )
 
@@ -24,6 +25,7 @@ const (
 )
 
 type Addons struct {
+	HelmChartRepository *string `json:"helmChartRepository,omitempty"`
 	// +optional
 	CNI *CNI `json:"cni,omitempty"`
 
@@ -46,6 +48,10 @@ func (Addons) VariableSchema() clusterv1.VariableSchema {
 			Description: "Cluster configuration",
 			Type:        "object",
 			Properties: map[string]clusterv1.JSONSchemaProps{
+				"helmChartRepository": {
+					Pattern:     patterns.DNS1123Label,
+					Description: "Optional OCI registry used to pull helm charts for adons",
+				},
 				"cni":               CNI{}.VariableSchema().OpenAPIV3Schema,
 				"nfd":               NFD{}.VariableSchema().OpenAPIV3Schema,
 				"clusterAutoscaler": ClusterAutoscaler{}.VariableSchema().OpenAPIV3Schema,

api/v1alpha1/constants.go

@@ -14,4 +14,6 @@ const (
 	AWSVariableName = "aws"
 	// NutanixVariableName is the Nutanix config patch variable name.
 	NutanixVariableName = "nutanix"
+	// HelmChartRepository is the variable name for the OCI registry for addons.
+	HelmChartRepository = "HelmChartRepository"
 )

api/v1alpha1/zz_generated.deepcopy.go

@@ -123,6 +123,7 @@ func (n *DefaultClusterAutoscaler) AfterControlPlaneInitialized(
 	case v1alpha1.AddonStrategyHelmAddon:
 		helmChart, err := n.helmChartInfoGetter.For(
 			ctx,
+			&req.Cluster,
 			log,
 			config.Autoscaler,
 		)

pkg/handlers/generic/lifecycle/clusterautoscaler/handler.go

@@ -130,7 +130,7 @@ func (c *CalicoCNI) AfterControlPlaneInitialized(
 	case v1alpha1.AddonStrategyHelmAddon:
 		// this is tigera and not calico because we deploy calico via operataor
 		log.Info("fetching settings for tigera-operator-config")
-		helmChart, err := c.helmChartInfoGetter.For(ctx, log, config.Tigera)
+		helmChart, err := c.helmChartInfoGetter.For(ctx, &req.Cluster, log, config.Tigera)
 		if err != nil {
 			log.Error(
 				err,

pkg/handlers/generic/lifecycle/cni/calico/handler.go

@@ -128,7 +128,7 @@ func (c *CiliumCNI) AfterControlPlaneInitialized(
 			client: c.client,
 		}
 	case v1alpha1.AddonStrategyHelmAddon:
-		helmChart, err := c.helmChartInfoGetter.For(ctx, log, config.Cilium)
+		helmChart, err := c.helmChartInfoGetter.For(ctx, &req.Cluster, log, config.Cilium)
 		if err != nil {
 			log.Error(
 				err,

pkg/handlers/generic/lifecycle/cni/cilium/handler.go

@@ -11,7 +11,12 @@ import (
 	"gopkg.in/yaml.v2"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
+	"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
+	"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig"
 )
 
 type Component string
@@ -26,9 +31,10 @@ const (
 )
 
 type HelmChartGetter struct {
-	cl          ctrlclient.Reader
-	cmName      string
-	cmNamespace string
+	cl           ctrlclient.Reader
+	cmName       string
+	cmNamespace  string
+	variablePath []string
 }
 
 type HelmChart struct {
@@ -45,6 +51,7 @@ func NewHelmChartGetterFromConfigMap(
 		cl,
 		cmName,
 		cmNamespace,
+		[]string{"addons", v1alpha1.HelmChartRepository},
 	}
 }
 
@@ -71,6 +78,7 @@ func (h *HelmChartGetter) get(
 
 func (h *HelmChartGetter) For(
 	ctx context.Context,
+	cluster *clusterv1.Cluster,
 	log logr.Logger,
 	name Component,
 ) (*HelmChart, error) {
@@ -80,6 +88,19 @@ func (h *HelmChartGetter) For(
 			h.cmName,
 			h.cmNamespace),
 	)
+	varMap := variables.ClusterVariablesToVariablesMap(cluster.Spec.Topology.Variables)
+
+	helmChartRepo, found, err := variables.Get[string](
+		varMap,
+		clusterconfig.MetaVariableName,
+		h.variablePath...)
+	if err != nil {
+		return nil, fmt.Errorf(
+			"failed to get helmChartRepo variable from %s: %w",
+			clusterconfig.MetaVariableName,
+			err,
+		)
+	}
 	cm, err := h.get(ctx)
 	if err != nil {
 		return nil, err
@@ -88,7 +109,10 @@ func (h *HelmChartGetter) For(
 	if !ok {
 		return nil, fmt.Errorf("did not find key %s in %v", name, cm.Data)
 	}
-	var settings HelmChart
-	err = yaml.Unmarshal([]byte(d), &settings)
-	return &settings, err
+	var chart HelmChart
+	err = yaml.Unmarshal([]byte(d), &chart)
+	if found {
+		chart.Repository = helmChartRepo
+	}
+	return &chart, err
 }

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

@@ -148,7 +148,7 @@ func (n *NutanixCSI) handleHelmAddonApply(
 		"cluster",
 		ctrlclient.ObjectKeyFromObject(&req.Cluster),
 	)
-	helmChart, err := n.helmChartInfoGetter.For(ctx, log, config.NutanixStorageCSI)
+	helmChart, err := n.helmChartInfoGetter.For(ctx, &req.Cluster, log, config.NutanixStorageCSI)
 	if err != nil {
 		return fmt.Errorf("failed to get values for nutanix-csi-config %w", err)
 	}
@@ -186,7 +186,12 @@ 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)
+	snapshotHelmChart, err := n.helmChartInfoGetter.For(
+		ctx,
+		&req.Cluster,
+		log,
+		config.NutanixSnapshotCSI,
+	)
 	if err != nil {
 		return fmt.Errorf("failed to get values for nutanix-csi-config %w", err)
 	}

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

@@ -116,7 +116,7 @@ func (n *DefaultNFD) AfterControlPlaneInitialized(
 			client: n.client,
 		}
 	case v1alpha1.AddonStrategyHelmAddon:
-		helmChart, err := n.helmChartInfoGetter.For(ctx, log, config.NFD)
+		helmChart, err := n.helmChartInfoGetter.For(ctx, &req.Cluster, log, config.NFD)
 		if err != nil {
 			log.Error(
 				err,