fix: Refactoring to follow smilar patterns as other components

fix: PR comment resolution

Author: legacyrj

charts/cluster-api-runtime-extensions-nutanix/addons/cni/multus/values-template.yaml

@@ -1,102 +1,18 @@
-# Default values for multus.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# Image configuration
-image:
-  repository: ghcr.io/k8snetworkplumbingwg/multus-cni
-  tag: ""  # If empty, will use Chart.AppVersion + suffix
-  suffix: "-thick"  # Default suffix (can be overridden)
-  pullPolicy: IfNotPresent
-
-# Image pull secrets
-imagePullSecrets: []
-
-# Service account configuration
-serviceAccount:
-  create: true
-  name: multus
-  annotations: {}
-
-# Pod security context
-podSecurityContext:
-  privileged: true
-
-# Container security context
-securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - NET_ADMIN
-      - SYS_ADMIN
-
-# Priority class
-priorityClassName: system-node-critical
-
-# Pod network configuration
-hostNetwork: true
-hostPID: true
-
-# Pod lifecycle configuration
-terminationGracePeriodSeconds: 10
-
-# Update strategy
-updateStrategy:
-  type: RollingUpdate
-  rollingUpdate:
-    maxUnavailable: 1
-
-# Tolerations
-tolerations:
-  - operator: Exists
-    effect: NoSchedule
-  - operator: Exists
-    effect: NoExecute
-
-# Node selector
-nodeSelector: {}
-
-# Affinity
-affinity: {}
-
-# Pod annotations
-podAnnotations: {}
-
-# Pod labels
-podLabels: {}
-
-# Resource limits and requests
-resources:
-  limits:
-    cpu: 100m
-    memory: 128Mi
-  requests:
-    cpu: 100m
-    memory: 128Mi
-
-# Multus daemon configuration
+# Multus daemon configuration overrides
 daemonConfig:
-  chrootDir: "/hostroot"
-  cniVersion: "0.3.1"
-  logLevel: "verbose"
-  logToStderr: true
-  readinessIndicatorFile: "{{ .ReadinessSocketPath }}"
-  cniConfigDir: "/host/etc/cni/net.d"
-  multusAutoconfigDir: "/host/etc/cni/net.d"
-  multusConfigFile: "auto"
-  socketDir: "/host/run/multus/"
+  readinessIndicatorFile: "{{ .SocketPath }}"
 
-{{- if .ReadinessSocketPath }}
+{{- if .SocketPath }}
 # Volumes for CNI readiness socket
 volumes:
-  - name: {{ .SocketVolumeName }}
+  - name: cni-readiness-sock
     hostPath:
-      path: "{{ .ReadinessSocketPath }}"
+      path: "{{ .SocketPath }}"
       type: Socket
 
 # Volume mounts for CNI readiness socket
 volumeMounts:
-  - name: {{ .SocketVolumeName }}
-    mountPath: "{{ .ReadinessSocketPath }}"
+  - name: cni-readiness-sock
+    mountPath: "{{ .SocketPath }}"
     readOnly: true
 {{- end }}

hack/addons/helm-chart-bundler/Dockerfile

@@ -1,4 +1,4 @@
-ARG MINDTHEGAP_VERSION=v1.17.0
+ARG MINDTHEGAP_VERSION=v1.24.0
 
 FROM --platform=${BUILDPLATFORM} ghcr.io/mesosphere/mindthegap:${MINDTHEGAP_VERSION} as bundle_builder
 # This gets called by goreleaser so the copy source has to be the path relative to the repo root.

pkg/handlers/lifecycle/cni/multus/deployer.go

@@ -9,15 +9,15 @@
 // MultusHandler implements the cluster lifecycle hooks and:
 // - Detects the cloud provider from the cluster infrastructure
 // - Reads CNI configuration from cluster variables
-// - Gets the readiness socket path for the configured CNI (via cni.ReadinessSocketPath)
+// - Gets the socket path for the configured CNI (via cni.SocketPath)
 // - Automatically deploys Multus with socket-based configuration
 //
-// MultusDeployer is the internal deployer that handles:
-// - Templating Helm values with the CNI readiness socket path
+// helmAddonStrategy is the internal strategy that handles:
+// - Templating Helm values with the CNI socket path
 // - Deploying Multus using HelmAddon strategy with Go template-based values
 //
 // Multus relies on the readinessIndicatorFile configuration to wait for the primary CNI
-// to be ready, eliminating the need for explicit wait logic in the deployer.
+// to be ready, eliminating the need for explicit wait logic in the strategy.
 //
 // This package does NOT expose Multus in the API - it's an internal addon
 // that deploys automatically based on cloud provider and CNI selection.

pkg/handlers/lifecycle/cni/multus/doc.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/pflag"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -17,30 +18,43 @@ import (
 	commonhandlers "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/lifecycle"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
+	capiutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/utils"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/addons"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/cni"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/config"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/options"
 )
 
+const (
+	defaultMultusReleaseName = "multus"
+	defaultMultusNamespace   = metav1.NamespaceSystem
+)
+
 type MultusConfig struct {
 	*options.GlobalOptions
+
+	helmAddonConfig *addons.HelmAddonConfig
 }
 
 func NewMultusConfig(globalOptions *options.GlobalOptions) *MultusConfig {
 	return &MultusConfig{
 		GlobalOptions: globalOptions,
+		helmAddonConfig: addons.NewHelmAddonConfig(
+			"default-multus-values-template",
+			defaultMultusNamespace,
+			defaultMultusReleaseName,
+		),
 	}
 }
 
 func (m *MultusConfig) AddFlags(prefix string, flags *pflag.FlagSet) {
-	// No flags needed for Multus - it's auto-deployed
+	m.helmAddonConfig.AddFlags(prefix+".helm-addon", flags)
 }
 
 type MultusHandler struct {
 	client              ctrlclient.Client
 	config              *MultusConfig
 	helmChartInfoGetter *config.HelmChartGetter
-	deployer            *MultusDeployer
 }
 
 var (
@@ -58,7 +72,6 @@ func New(
 		client:              c,
 		config:              cfg,
 		helmChartInfoGetter: helmChartInfoGetter,
-		deployer:            NewMultusDeployer(c, helmChartInfoGetter),
 	}
 }
 
@@ -101,16 +114,15 @@ func (m *MultusHandler) apply(
 	)
 
 	// Check if Multus is supported for this cloud provider
-	isSupported, providerName := m.deployer.isCloudProviderSupported(cluster)
-
-	if !isSupported {
+	provider := capiutils.GetProvider(cluster)
+	if provider != "eks" && provider != "nutanix" {
 		log.V(5).Info(
 			"Multus is not supported for this cloud provider. Skipping Multus deployment.",
 		)
 		return
 	}
 
-	log.Info(fmt.Sprintf("Cluster is %s. Checking CNI configuration for Multus deployment.", providerName))
+	log.Info(fmt.Sprintf("Cluster is %s. Checking CNI configuration for Multus deployment.", provider))
 
 	// Read CNI configuration to detect which CNI is deployed
 	varMap := variables.ClusterVariablesToVariablesMap(cluster.Spec.Topology.Variables)
@@ -130,19 +142,37 @@ func (m *MultusHandler) apply(
 		return
 	}
 
-	// Get readiness socket path for the CNI provider
-	readinessSocketPath, err := cni.ReadinessSocketPath(cniVar.Provider)
+	// Get socket path for the CNI provider
+	socketPath, err := cni.SocketPath(cniVar.Provider)
 	if err != nil {
 		log.V(5).
 			Info(fmt.Sprintf("Multus does not support CNI provider: %s. Skipping Multus deployment.", cniVar.Provider))
 		return
 	}
 
-	log.Info(fmt.Sprintf("Auto-deploying Multus for %s cluster with %s CNI", providerName, cniVar.Provider))
+	log.Info(fmt.Sprintf("Auto-deploying Multus for %s cluster with %s CNI", provider, cniVar.Provider))
+
+	// Get helm chart configuration
+	helmChart, err := m.helmChartInfoGetter.For(ctx, log, config.Multus)
+	if err != nil {
+		log.Error(
+			err,
+			"failed to get configmap with helm settings",
+		)
+		resp.SetStatus(runtimehooksv1.ResponseStatusFailure)
+		resp.SetMessage(
+			fmt.Sprintf("failed to get configuration to create helm addon: %v",
+				err,
+			),
+		)
+		return
+	}
 
-	// Deploy Multus using the deployer
+	// Create and apply helm addon strategy
 	targetNamespace := m.config.DefaultsNamespace()
-	if err := m.deployer.Deploy(ctx, cluster, readinessSocketPath, targetNamespace, log); err != nil {
+	strategy := newHelmAddonStrategy(m.client, helmChart, m.config.helmAddonConfig)
+
+	if err := strategy.apply(ctx, cluster, socketPath, targetNamespace, log); err != nil {
 		log.Error(err, "failed to deploy Multus")
 		resp.SetStatus(runtimehooksv1.ResponseStatusFailure)
 		resp.SetMessage(fmt.Sprintf("failed to deploy Multus: %v", err))