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 }}

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

@@ -9,12 +9,11 @@
 // 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
 //
 // helmAddonStrategy is the internal strategy that handles:
-// - Cloud provider support detection (EKS and Nutanix)
-// - Templating Helm values with the CNI readiness socket path
+// - 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

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

@@ -20,10 +20,26 @@ import (
 	"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"
+	capiutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/utils"
 )
 
+type helmAddonConfig struct {
+	defaultValuesTemplateConfigMapName string
+}
+
+func (c *helmAddonConfig) AddFlags(prefix string, flags *pflag.FlagSet) {
+	flags.StringVar(
+		&c.defaultValuesTemplateConfigMapName,
+		prefix+".default-values-template-configmap-name",
+		"default-multus-values-template",
+		"default values ConfigMap name",
+	)
+}
+
 type MultusConfig struct {
 	*options.GlobalOptions
+
+	helmAddonConfig helmAddonConfig
 }
 
 func NewMultusConfig(globalOptions *options.GlobalOptions) *MultusConfig {
@@ -33,7 +49,7 @@ func NewMultusConfig(globalOptions *options.GlobalOptions) *MultusConfig {
 }
 
 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 {
@@ -99,16 +115,15 @@ func (m *MultusHandler) apply(
 	)
 
 	// Check if Multus is supported for this cloud provider
-	isSupported, providerName := 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)
@@ -128,15 +143,15 @@ 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)
@@ -156,9 +171,9 @@ func (m *MultusHandler) apply(
 
 	// Create and apply helm addon strategy
 	targetNamespace := m.config.DefaultsNamespace()
-	strategy := newHelmAddonStrategy(m.client, helmChart)
+	strategy := newHelmAddonStrategy(m.client, helmChart, m.config.helmAddonConfig)
 
-	if err := strategy.apply(ctx, cluster, readinessSocketPath, targetNamespace, log); err != nil {
+	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))

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

@@ -22,12 +22,14 @@ const (
 )
 
 type helmAddonStrategy struct {
+	config    helmAddonConfig
 	client    ctrlclient.Client
 	helmChart *config.HelmChart
 }
 
-func newHelmAddonStrategy(client ctrlclient.Client, helmChart *config.HelmChart) helmAddonStrategy {
+func newHelmAddonStrategy(client ctrlclient.Client, helmChart *config.HelmChart, config helmAddonConfig) helmAddonStrategy {
 	return helmAddonStrategy{
+		config:    config,
 		client:    client,
 		helmChart: helmChart,
 	}
@@ -36,20 +38,20 @@ func newHelmAddonStrategy(client ctrlclient.Client, helmChart *config.HelmChart)
 func (s helmAddonStrategy) apply(
 	ctx context.Context,
 	cluster *clusterv1.Cluster,
-	readinessSocketPath string,
+	socketPath string,
 	defaultsNamespace string,
 	log logr.Logger,
 ) error {
 	// Deploy Multus using HelmAddonApplier with template function
 	strategy := addons.NewHelmAddonApplier(
 		addons.NewHelmAddonConfig(
-			"default-multus-values-template",
+			s.config.defaultValuesTemplateConfigMapName,
 			defaultMultusNamespace,
 			defaultMultusReleaseName,
 		),
 		s.client,
 		s.helmChart,
-	).WithValueTemplater(templateValuesFunc(readinessSocketPath)).
+	).WithValueTemplater(templateValuesFunc(socketPath)).
 		WithDefaultWaiter()
 
 	if err := strategy.Apply(ctx, cluster, defaultsNamespace, log); err != nil {
@@ -59,23 +61,3 @@ func (s helmAddonStrategy) apply(
 	log.Info("Successfully deployed Multus")
 	return nil
 }
-
-// isCloudProviderSupported checks if the cluster is a supported cloud provider
-// by inspecting the infrastructure reference.
-func isCloudProviderSupported(cluster *clusterv1.Cluster) (
-	isSupported bool,
-	providerName string,
-) {
-	if cluster.Spec.InfrastructureRef == nil {
-		return false, ""
-	}
-
-	switch cluster.Spec.InfrastructureRef.Kind {
-	case "AWSManagedCluster":
-		return true, "EKS"
-	case "NutanixCluster":
-		return true, "Nutanix"
-	default:
-		return false, ""
-	}
-}

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

@@ -6,35 +6,26 @@ package multus
 import (
 	"bytes"
 	"fmt"
-	"path/filepath"
-	"strings"
 	"text/template"
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
 // templateValuesFunc returns a template function that parses the Multus values template
-// and replaces socket-related placeholders with the provided readiness socket path.
-func templateValuesFunc(readinessSocketPath string) func(*clusterv1.Cluster, string) (string, error) {
+// and replaces socket-related placeholders with the provided socket path.
+func templateValuesFunc(socketPath string) func(*clusterv1.Cluster, string) (string, error) {
 	return func(_ *clusterv1.Cluster, valuesTemplate string) (string, error) {
 		t, err := template.New("").Parse(valuesTemplate)
 		if err != nil {
 			return "", fmt.Errorf("failed to parse Multus values template: %w", err)
 		}
 
 		type input struct {
-			ReadinessSocketPath string
-			SocketVolumeName    string
+			SocketPath string
 		}
 
-		// Extract volume name from socket path
-		// e.g., "/run/cilium/cilium.sock" -> "cilium-sock"
-		// or "/var/run/calico/cni-server.sock" -> "calico-sock"
-		socketVolumeName := extractVolumeName(readinessSocketPath)
-
 		templateInput := input{
-			ReadinessSocketPath: readinessSocketPath,
-			SocketVolumeName:    socketVolumeName,
+			SocketPath: socketPath,
 		}
 
 		var b bytes.Buffer
@@ -46,37 +37,3 @@ func templateValuesFunc(readinessSocketPath string) func(*clusterv1.Cluster, str
 		return b.String(), nil
 	}
 }
-
-// extractVolumeName derives a volume name from the socket path.
-// Examples:
-//   - "/run/cilium/cilium.sock" -> "cilium-sock"
-//   - "/var/run/calico/cni-server.sock" -> "calico-sock"
-func extractVolumeName(socketPath string) string {
-	if socketPath == "" {
-		return ""
-	}
-
-	// Get the directory part and extract the CNI name
-	dir := filepath.Dir(socketPath)
-	// Remove leading/trailing slashes and get the last component
-	dir = strings.Trim(dir, "/")
-	parts := strings.Split(dir, "/")
-
-	var name string
-	// Look for "cilium" or "calico" in the path
-	for _, part := range parts {
-		if part == "cilium" || part == "calico" {
-			name = part
-			break
-		}
-	}
-
-	if name == "" {
-		// Fallback: use the last directory component before the socket
-		if len(parts) > 0 {
-			name = parts[len(parts)-1]
-		}
-	}
-
-	return name + "-sock"
-}

pkg/handlers/lifecycle/cni/socket.go

@@ -9,16 +9,16 @@ import (
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
 )
 
-// ReadinessSocketPath returns the readiness socket path for the given CNI provider.
+// SocketPath returns the socket path for the given CNI provider.
 // The socket path is used by Multus to wait for the primary CNI to be ready.
 // Returns an empty string and error for unsupported providers.
-func ReadinessSocketPath(cniProvider string) (string, error) {
-	switch cniProvider {
+func SocketPath(provider string) (string, error) {
+	switch provider {
 	case v1alpha1.CNIProviderCilium:
 		return "/run/cilium/cilium.sock", nil
 	case v1alpha1.CNIProviderCalico:
 		return "/var/run/calico/cni-server.sock", nil
 	default:
-		return "", fmt.Errorf("unsupported CNI provider for Multus: %s", cniProvider)
+		return "", fmt.Errorf("unsupported CNI provider for Multus: %s", provider)
 	}
 }