feat: Multus Config

Author: legacyrj

charts/cluster-api-runtime-extensions-nutanix/README.md

@@ -78,6 +78,8 @@ A Helm chart for cluster-api-runtime-extensions-nutanix
 | hooks.cni.cilium.crsStrategy.defaultCiliumConfigMap.name | string | `"cilium"` |  |
 | hooks.cni.cilium.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` |  |
 | hooks.cni.cilium.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-cilium-cni-helm-values-template"` |  |
+| hooks.cni.multus.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` |  |
+| hooks.cni.multus.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-multus-values-template"` |  |
 | hooks.cosi.controller.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` |  |
 | hooks.cosi.controller.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-cosi-controller-helm-values-template"` |  |
 | hooks.csi.aws-ebs.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` |  |

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

@@ -80,8 +80,23 @@ daemonConfig:
   cniVersion: "0.3.1"
   logLevel: "verbose"
   logToStderr: true
-  readinessIndicatorFile: ""
+  readinessIndicatorFile: "{{ .ReadinessSocketPath }}"
   cniConfigDir: "/host/etc/cni/net.d"
   multusAutoconfigDir: "/host/etc/cni/net.d"
   multusConfigFile: "auto"
   socketDir: "/host/run/multus/"
+
+{{- if .ReadinessSocketPath }}
+# Volumes for CNI readiness socket
+volumes:
+  - name: {{ .SocketVolumeName }}
+    hostPath:
+      path: "{{ .ReadinessSocketPath }}"
+      type: Socket
+
+# Volume mounts for CNI readiness socket
+volumeMounts:
+  - name: {{ .SocketVolumeName }}
+    mountPath: "{{ .ReadinessSocketPath }}"
+    readOnly: true
+{{- end }}

charts/cluster-api-runtime-extensions-nutanix/templates/cni/multus/manifests/helm-addon-installation.yaml

@@ -10,4 +10,3 @@ data:
   values.yaml: |-
     {{- .Files.Get "addons/cni/multus/values-template.yaml" | nindent 4 }}
 {{- end -}}
-

charts/cluster-api-runtime-extensions-nutanix/values.schema.json

@@ -381,6 +381,27 @@
                                     }
                                 }
                             }
+                        },
+                        "multus": {
+                            "type": "object",
+                            "properties": {
+                                "helmAddonStrategy": {
+                                    "type": "object",
+                                    "properties": {
+                                        "defaultValueTemplateConfigMap": {
+                                            "type": "object",
+                                            "properties": {
+                                                "create": {
+                                                    "type": "boolean"
+                                                },
+                                                "name": {
+                                                    "type": "string"
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
                         }
                     }
                 },

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

@@ -18,4 +18,3 @@ helmCharts:
   version: 0.1.0
   includeCRDs: true
   skipTests: true
-