feat: Multus config

Author: legacyrj

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

@@ -0,0 +1,87 @@
+# 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
+daemonConfig:
+  chrootDir: "/hostroot"
+  cniVersion: "0.3.1"
+  logLevel: "verbose"
+  logToStderr: true
+  readinessIndicatorFile: ""
+  cniConfigDir: "/host/etc/cni/net.d"
+  multusAutoconfigDir: "/host/etc/cni/net.d"
+  multusConfigFile: "auto"
+  socketDir: "/host/run/multus/"

hack/addons/kustomize/multus/kustomization.yaml.tmpl

@@ -0,0 +1,27 @@
+# Copyright 2024 Nutanix. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+metadata:
+  name: multus
+
+sortOptions:
+  order: fifo
+
+# Multus is deployed via the Shared Multus Helper Package in handlers,
+# not through the helm-config.yaml bundle. Commenting out to avoid
+# file:// path issues during Docker builds.
+# helmCharts:
+# - name: multus
+#   repo: file:///Users/raj.surve/DKP/charts/staging
+#   releaseName: multus
+#   version: 0.1.0
+#   includeCRDs: true
+#   skipTests: true
+#   namespace: kube-system
+#   valuesFile: helm-values.yaml
+
+namespace: kube-system
+

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

@@ -18,6 +18,7 @@ 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"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/cni/multus"
 	"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"
 )
@@ -188,5 +189,13 @@ func (c *CalicoCNI) apply(
 		return
 	}
 
+	// Deploy Multus alongside Calico after successful Calico deployment
+	multusDeployer := multus.NewMultusDeployer(c.client, c.helmChartInfoGetter)
+	if err := multusDeployer.DeployWithCNI(ctx, cluster, multus.CNITypeCalico, c.config.DefaultsNamespace(), log); err != nil {
+		log.Error(err, "failed to deploy Multus alongside Calico")
+		// Don't fail the entire deployment if Multus fails, just log the error
+		log.Info("Calico deployed successfully but Multus deployment failed")
+	}
+
 	resp.SetStatus(runtimehooksv1.ResponseStatusSuccess)
 }

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

@@ -26,6 +26,7 @@ import (
 	"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"
 	"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/multus"
 	"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"
 	handlersutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/utils"
@@ -246,6 +247,14 @@ func (c *CiliumCNI) apply(
 		return
 	}
 
+	// Deploy Multus alongside Cilium after successful Cilium deployment
+	multusDeployer := multus.NewMultusDeployer(c.client, c.helmChartInfoGetter)
+	if err := multusDeployer.DeployWithCNI(ctx, cluster, multus.CNITypeCilium, targetNamespace, log); err != nil {
+		log.Error(err, "failed to deploy Multus alongside Cilium")
+		// Don't fail the entire deployment if Multus fails, just log the error
+		log.Info("Cilium deployed successfully but Multus deployment failed")
+	}
+
 	resp.SetStatus(runtimehooksv1.ResponseStatusSuccess)
 }