Skip to content

chore: enable mounting cni directory for ovn-kubernetes #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 4, 2025
Merged

chore: enable mounting cni directory for ovn-kubernetes #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions helm/ovn-kubernetes-dpf/templates/dpu-manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ spec:
emptyDir: {}
- name: cni-bin-dir
hostPath:
path: /opt/cni/bin
path: {{.Values.dpuManifests.cniBinDir }}
type: Directory
- name: nvipam-daemon-socket-dir
hostPath:
Expand Down Expand Up @@ -854,10 +854,10 @@ spec:
path: /var/run/ovn-kubernetes
- name: host-opt-cni-bin
hostPath:
path: /opt/cni/bin
path: {{.Values.dpuManifests.cniBinDir }}
- name: host-etc-cni-netd
hostPath:
path: /etc/cni/net.d
path: {{.Values.dpuManifests.cniConfDir }}
- name: host-slash
hostPath:
path: /
Expand Down
4 changes: 2 additions & 2 deletions helm/ovn-kubernetes-dpf/templates/host-with-dpu-manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,10 @@ spec:
path: /var/run/ovn-kubernetes
- name: host-opt-cni-bin
hostPath:
path: /opt/cni/bin
path: {{ .Values.nodeWithDPUManifests.cniBinDir}}
- name: host-etc-cni-netd
hostPath:
path: /etc/cni/net.d
path: {{ .Values.nodeWithDPUManifests.cniConfDir }}
- name: host-slash
hostPath:
path: /
Expand Down
4 changes: 2 additions & 2 deletions helm/ovn-kubernetes-dpf/templates/host-without-dpu-manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,10 +617,10 @@ spec:
path: /var/run/ovn-kubernetes
- name: host-opt-cni-bin
hostPath:
path: /opt/cni/bin
path: {{ .Values.nodeWithoutDPUManifests.cniBinDir}}
- name: host-etc-cni-netd
hostPath:
path: /etc/cni/net.d
path: {{ .Values.nodeWithoutDPUManifests.cniConfDir}}
- name: host-slash
hostPath:
path: /
Expand Down
6 changes: 6 additions & 0 deletions helm/ovn-kubernetes-dpf/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ nodeWithDPUManifests:
nodeMgmtPortNetdev: ""
dpuServiceAccountName: ovn-dpu
dpuServiceAccountNamespace: ovn-kubernetes
cniBinDir: "/opt/cni/bin"
cniConfDir: "/etc/cni/net.d"

# -- Variables related to manifests that are deployed for nodes without DPU
nodeWithoutDPUManifests:
Expand All @@ -30,6 +32,8 @@ nodeWithoutDPUManifests:
repository: ${OVNKUBERNETES_IMAGE}
tag: ${TAG}
pullPolicy: IfNotPresent
cniBinDir: "/opt/cni/bin"
cniConfDir: "/etc/cni/net.d"

# -- Variables related to manifests that are deployed on the DPU
dpuManifests:
Expand All @@ -47,6 +51,8 @@ dpuManifests:
ipamPFIPIndex: 1
externalDHCP: false
gatewayDiscoveryNetwork: "169.254.99.100/32" # This is a "dummy" subnet used to get the default gateway address from DHCP server (via option 121)
cniBinDir: "/opt/cni/bin"
cniConfDir: "/etc/cni/net.d"

# -- Variables related to manifests that are needed to setup the OVN Control Plane
controlPlaneManifests:
Expand Down
8 changes: 8 additions & 0 deletions helm/ovn-kubernetes-dpf/values.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ nodeWithDPUManifests:
nodeMgmtPortNetdev: ""
dpuServiceAccountName: ovn-dpu
dpuServiceAccountNamespace: ovn-kubernetes
cniBinDir: "/opt/cni/bin"
cniConfDir: "/etc/cni/net.d"

# -- Variables related to manifests that are deployed for nodes without DPU
nodeWithoutDPUManifests:
Expand All @@ -30,6 +32,8 @@ nodeWithoutDPUManifests:
repository: ${OVNKUBERNETES_IMAGE}
tag: ${TAG}
pullPolicy: IfNotPresent
cniBinDir: "/opt/cni/bin"
cniConfDir: "/etc/cni/net.d"

# -- Variables related to manifests that are deployed on the DPU
dpuManifests:
Expand All @@ -47,6 +51,8 @@ dpuManifests:
ipamPFIPIndex: 1
externalDHCP: false
gatewayDiscoveryNetwork: "169.254.99.100/32" # This is a "dummy" subnet used to get the default gateway address from DHCP server (via option 121)
cniBinDir: "/opt/cni/bin"
cniConfDir: "/etc/cni/net.d"

# -- Variables related to manifests that are needed to setup the OVN Control Plane
controlPlaneManifests:
Expand All @@ -55,6 +61,8 @@ controlPlaneManifests:
repository: ${OVNKUBERNETES_IMAGE}
tag: ${TAG}
pullPolicy: IfNotPresent
cniBinDir: "/opt/cni/bin"
cniConfDir: "/etc/cni/net.d"

# -- Endpoint of Kubernetes API server
k8sAPIServer: https://172.25.0.2:6443
Expand Down