fix: Refactoring to follow smilar patterns as other components

Author: legacyrj

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/doc.go

@@ -12,12 +12,13 @@
 // - Gets the readiness socket path for the configured CNI (via cni.ReadinessSocketPath)
 // - Automatically deploys Multus with socket-based configuration
 //
-// MultusDeployer is the internal deployer that handles:
+// helmAddonStrategy is the internal strategy that handles:
+// - Cloud provider support detection (EKS and Nutanix)
 // - Templating Helm values with the CNI readiness 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/handler.go

@@ -40,7 +40,6 @@ type MultusHandler struct {
 	client              ctrlclient.Client
 	config              *MultusConfig
 	helmChartInfoGetter *config.HelmChartGetter
-	deployer            *MultusDeployer
 }
 
 var (
@@ -58,7 +57,6 @@ func New(
 		client:              c,
 		config:              cfg,
 		helmChartInfoGetter: helmChartInfoGetter,
-		deployer:            NewMultusDeployer(c, helmChartInfoGetter),
 	}
 }
 
@@ -101,7 +99,7 @@ func (m *MultusHandler) apply(
 	)
 
 	// Check if Multus is supported for this cloud provider
-	isSupported, providerName := m.deployer.isCloudProviderSupported(cluster)
+	isSupported, providerName := isCloudProviderSupported(cluster)
 
 	if !isSupported {
 		log.V(5).Info(
@@ -140,9 +138,18 @@ func (m *MultusHandler) apply(
 
 	log.Info(fmt.Sprintf("Auto-deploying Multus for %s cluster with %s CNI", providerName, cniVar.Provider))
 
-	// Deploy Multus using the deployer
-	targetNamespace := m.config.DefaultsNamespace()
-	if err := m.deployer.Deploy(ctx, cluster, readinessSocketPath, targetNamespace, log); err != nil {
+	// Get Helm chart info
+	helmChart, err := m.helmChartInfoGetter.For(ctx, log, config.Multus)
+	if err != nil {
+		log.Error(err, "failed to get Multus Helm chart configuration")
+		resp.SetStatus(runtimehooksv1.ResponseStatusFailure)
+		resp.SetMessage(fmt.Sprintf("failed to get Multus Helm chart configuration: %v", err))
+		return
+	}
+
+	// Create and apply strategy
+	strategy := newHelmAddonStrategy(m.client, helmChart)
+	if err := strategy.apply(ctx, cluster, readinessSocketPath, m.config.DefaultsNamespace(), log); err != nil {
 		log.Error(err, "failed to deploy Multus")
 		resp.SetStatus(runtimehooksv1.ResponseStatusFailure)
 		resp.SetMessage(fmt.Sprintf("failed to deploy Multus: %v", err))

pkg/handlers/lifecycle/cni/multus/deployer.go renamed to pkg/handlers/lifecycle/cni/multus/strategy_helmaddon.go

@@ -21,27 +21,27 @@ const (
 	defaultMultusNamespace   = metav1.NamespaceSystem
 )
 
-type MultusDeployer struct {
-	client              ctrlclient.Client
-	helmChartInfoGetter *config.HelmChartGetter
+type helmAddonStrategy struct {
+	client    ctrlclient.Client
+	helmChart *config.HelmChart
 }
 
-func NewMultusDeployer(client ctrlclient.Client, helmChartInfoGetter *config.HelmChartGetter) *MultusDeployer {
-	return &MultusDeployer{
-		client:              client,
-		helmChartInfoGetter: helmChartInfoGetter,
+func newHelmAddonStrategy(client ctrlclient.Client, helmChart *config.HelmChart) helmAddonStrategy {
+	return helmAddonStrategy{
+		client:    client,
+		helmChart: helmChart,
 	}
 }
 
-func (m *MultusDeployer) Deploy(
+func (s helmAddonStrategy) apply(
 	ctx context.Context,
 	cluster *clusterv1.Cluster,
 	readinessSocketPath string,
-	targetNamespace string,
+	defaultsNamespace string,
 	log logr.Logger,
 ) error {
 	// Check if Multus deployment is supported for this cloud provider
-	isSupported, providerName := m.isCloudProviderSupported(cluster)
+	isSupported, providerName := isCloudProviderSupported(cluster)
 
 	// Currently, Multus is only supported for EKS and Nutanix clusters
 	if !isSupported {
@@ -51,31 +51,19 @@ func (m *MultusDeployer) Deploy(
 
 	log.Info(fmt.Sprintf("Cluster is %s. Proceeding with Multus deployment.", providerName))
 
-	// Get Multus Helm chart info
-	helmChart, err := m.helmChartInfoGetter.For(ctx, log, config.Multus)
-	if err != nil {
-		// For local testing, provide a placeholder chart info
-		log.Info("Multus not found in helm-config.yaml, using placeholder chart info for local development")
-		helmChart = &config.HelmChart{
-			Name:       "multus",
-			Version:    "dev",
-			Repository: "",
-		}
-	}
-
 	// Deploy Multus using HelmAddonApplier with template function
 	strategy := addons.NewHelmAddonApplier(
 		addons.NewHelmAddonConfig(
 			"default-multus-values-template",
 			defaultMultusNamespace,
 			defaultMultusReleaseName,
 		),
-		m.client,
-		helmChart,
+		s.client,
+		s.helmChart,
 	).WithValueTemplater(templateValuesFunc(readinessSocketPath)).
 		WithDefaultWaiter()
 
-	if err := strategy.Apply(ctx, cluster, targetNamespace, log); err != nil {
+	if err := strategy.Apply(ctx, cluster, defaultsNamespace, log); err != nil {
 		return fmt.Errorf("failed to apply Multus deployment: %w", err)
 	}
 
@@ -85,7 +73,7 @@ func (m *MultusDeployer) Deploy(
 
 // isCloudProviderSupported checks if the cluster is a supported cloud provider
 // by inspecting the infrastructure reference.
-func (m *MultusDeployer) isCloudProviderSupported(cluster *clusterv1.Cluster) (
+func isCloudProviderSupported(cluster *clusterv1.Cluster) (
 	isSupported bool,
 	providerName string,
 ) {