Skip to content

Commit 1300f08

Browse files
committed
feat: Multus config
feat: multus config with standlone handler
1 parent 525d099 commit 1300f08

File tree

12 files changed

+687
-1
lines changed

12 files changed

+687
-1
lines changed
Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
# Default values for multus.
2+
# This is a YAML-formatted file.
3+
# Declare variables to be passed into your templates.
4+
5+
# Image configuration
6+
image:
7+
repository: ghcr.io/k8snetworkplumbingwg/multus-cni
8+
tag: "" # If empty, will use Chart.AppVersion + suffix
9+
suffix: "-thick" # Default suffix (can be overridden)
10+
pullPolicy: IfNotPresent
11+
12+
# Image pull secrets
13+
imagePullSecrets: []
14+
15+
# Service account configuration
16+
serviceAccount:
17+
create: true
18+
name: multus
19+
annotations: {}
20+
21+
# Pod security context
22+
podSecurityContext:
23+
privileged: true
24+
25+
# Container security context
26+
securityContext:
27+
privileged: true
28+
capabilities:
29+
add:
30+
- NET_ADMIN
31+
- SYS_ADMIN
32+
33+
# Priority class
34+
priorityClassName: system-node-critical
35+
36+
# Pod network configuration
37+
hostNetwork: true
38+
hostPID: true
39+
40+
# Pod lifecycle configuration
41+
terminationGracePeriodSeconds: 10
42+
43+
# Update strategy
44+
updateStrategy:
45+
type: RollingUpdate
46+
rollingUpdate:
47+
maxUnavailable: 1
48+
49+
# Tolerations
50+
tolerations:
51+
- operator: Exists
52+
effect: NoSchedule
53+
- operator: Exists
54+
effect: NoExecute
55+
56+
# Node selector
57+
nodeSelector: {}
58+
59+
# Affinity
60+
affinity: {}
61+
62+
# Pod annotations
63+
podAnnotations: {}
64+
65+
# Pod labels
66+
podLabels: {}
67+
68+
# Resource limits and requests
69+
resources:
70+
limits:
71+
cpu: 100m
72+
memory: 128Mi
73+
requests:
74+
cpu: 100m
75+
memory: 128Mi
76+
77+
# Multus daemon configuration
78+
daemonConfig:
79+
chrootDir: "/hostroot"
80+
cniVersion: "0.3.1"
81+
logLevel: "verbose"
82+
logToStderr: true
83+
readinessIndicatorFile: ""
84+
cniConfigDir: "/host/etc/cni/net.d"
85+
multusAutoconfigDir: "/host/etc/cni/net.d"
86+
multusConfigFile: "auto"
87+
socketDir: "/host/run/multus/"
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Copyright 2024 Nutanix. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
{{- if .Values.hooks.cni.multus.helmAddonStrategy.defaultValueTemplateConfigMap.create }}
5+
apiVersion: v1
6+
kind: ConfigMap
7+
metadata:
8+
name: '{{ .Values.hooks.cni.multus.helmAddonStrategy.defaultValueTemplateConfigMap.name }}'
9+
data:
10+
values.yaml: |-
11+
{{- .Files.Get "addons/cni/multus/values-template.yaml" | nindent 4 }}
12+
{{- end -}}
13+

charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ data:
4343
ChartName: metallb
4444
ChartVersion: 0.15.2
4545
RepositoryURL: '{{ if .Values.helmRepository.enabled }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://metallb.github.io/metallb{{ end }}'
46+
multus: |
47+
ChartName: multus
48+
ChartVersion: 0.1.0
49+
RepositoryURL: '{{ if .Values.helmRepository.enabled }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://mesosphere.github.io/charts/stable/{{ end }}'
4650
nfd: |
4751
ChartName: node-feature-discovery
4852
ChartVersion: 0.18.1

charts/cluster-api-runtime-extensions-nutanix/values.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ hooks:
4343
defaultValueTemplateConfigMap:
4444
create: true
4545
name: default-cilium-cni-helm-values-template
46+
multus:
47+
helmAddonStrategy:
48+
defaultValueTemplateConfigMap:
49+
create: true
50+
name: default-multus-values-template
4651
csi:
4752
nutanix:
4853
helmAddonStrategy:

hack/addons/helm-chart-bundler/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG MINDTHEGAP_VERSION=v1.24.0
1+
ARG MINDTHEGAP_VERSION=v1.17.0
22

33
FROM --platform=${BUILDPLATFORM} ghcr.io/mesosphere/mindthegap:${MINDTHEGAP_VERSION} as bundle_builder
44
# This gets called by goreleaser so the copy source has to be the path relative to the repo root.

hack/addons/helm-chart-bundler/repos.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ repositories:
5151
charts:
5252
metallb:
5353
- 0.15.2
54+
multus:
55+
repoURL: https://mesosphere.github.io/charts/stable/
56+
charts:
57+
multus:
58+
- 0.1.0
5459
node-feature-discovery:
5560
repoURL: https://kubernetes-sigs.github.io/node-feature-discovery/charts
5661
charts:
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Copyright 2024 Nutanix. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
apiVersion: kustomize.config.k8s.io/v1beta1
5+
kind: Kustomization
6+
7+
metadata:
8+
name: multus
9+
10+
sortOptions:
11+
order: fifo
12+
13+
helmCharts:
14+
- name: multus
15+
namespace: kube-system
16+
repo: https://mesosphere.github.io/charts/stable/
17+
releaseName: multus
18+
version: 0.1.0
19+
includeCRDs: true
20+
skipTests: true
21+

0 commit comments

Comments
 (0)