Define one more SR-IOV network for NetDevice type
SPGW-U and the other regular network applications (e.g., CDN and BBU/CU)
use SR-IOV/VFIO and SR-IOV/NetDevice, respectively.
Thus, need to define one more SR-IOV network.
Change-Id: Iff331fcb8f2040ce4127be5d591c6bd4e1aa32bd
diff --git a/mcord-release/mcord-setup/Chart.yaml b/mcord-release/mcord-setup/Chart.yaml
index c3db31c..afdf2fd 100644
--- a/mcord-release/mcord-setup/Chart.yaml
+++ b/mcord-release/mcord-setup/Chart.yaml
@@ -18,4 +18,4 @@
appVersion: "1.0"
description: The prerequisite setup of M-CORD
name: mcord-setup
-version: 0.1.1
+version: 0.1.2
diff --git a/mcord-release/mcord-setup/templates/NOTES.txt b/mcord-release/mcord-setup/templates/NOTES.txt
index bc70b1d..a059f77 100644
--- a/mcord-release/mcord-setup/templates/NOTES.txt
+++ b/mcord-release/mcord-setup/templates/NOTES.txt
@@ -19,15 +19,15 @@
Your configurations for SR-IOV network device plugin as following:
- 10-Gigabit NIC PCI address: {{ .Values.sriov.devicepci }}
- SR-IOV device type: {{ .Values.sriov.devicetype }}
+ 10-Gigabit NIC PCI address: {{ .Values.sriov_vfio.devicepci }}
+ SR-IOV device type: {{ .Values.sriov_vfio.devicetype }} and {{ .Values.sriov_netdevice.devicetype }}
You can run following command to check SR-IOV is working in Kubernetes cluster:
$ kubectl -n kube-system -l name=sriov-device-plugin -o wide get pods
$ kubectl get nodes -o json | jq -r '.items[] | "\(.metadata.name): \(.status.allocatable)"'
- node1: {"cpu":"39800m","ephemeral-storage":"452697199891","hugepages-1Gi":"32Gi","intel.com/sriov":"63","memory":"31776336Ki","pods":"110"}
- node2: {"cpu":"39800m","ephemeral-storage":"452697199891","hugepages-1Gi":"32Gi","intel.com/sriov":"63","memory":"31776336Ki","pods":"110"}
+ node1: {"cpu":"39800m","ephemeral-storage":"452697199891","hugepages-1Gi":"32Gi","intel.com/sriov_vfio":"63","intel.com/sriov_netdevice":"63","memory":"31776336Ki","pods":"110"}
+ node2: {"cpu":"39800m","ephemeral-storage":"452697199891","hugepages-1Gi":"32Gi","intel.com/sriov_vfio":"63","intel.com/sriov_netdevice":"63","memory":"31776336Ki","pods":"110"}
-The result should show "intel.com/sriov" resource is registered to cluster, and have some virtual function available here.
+The result should show "intel.com/sriov_*" resource is registered to cluster, and have some virtual function available here.
diff --git a/mcord-release/mcord-setup/templates/sriov-conf.yaml b/mcord-release/mcord-setup/templates/sriov-conf.yaml
index 03befce..fcc0f24 100644
--- a/mcord-release/mcord-setup/templates/sriov-conf.yaml
+++ b/mcord-release/mcord-setup/templates/sriov-conf.yaml
@@ -25,10 +25,16 @@
"resourceList":
[
{
- "resourceName": {{ .Values.sriov.name | quote }},
- "rootDevices": [{{ .Values.sriov.devicepci | quote }}],
+ "resourceName": {{ .Values.sriov_vfio.name | quote }},
+ "rootDevices": [{{ .Values.sriov_vfio.devicepci | quote }}],
"sriovMode": true,
- "deviceType": {{ .Values.sriov.devicetype | quote }}
+ "deviceType": {{ .Values.sriov_vfio.devicetype | quote }}
+ },
+ {
+ "resourceName": {{ .Values.sriov_netdevice.name | quote }},
+ "rootDevices": [{{ .Values.sriov_netdevice.devicepci | quote }}],
+ "sriovMode": true,
+ "deviceType": {{ .Values.sriov_netdevice.devicetype | quote }}
}
]
}
diff --git a/mcord-release/mcord-setup/values.yaml b/mcord-release/mcord-setup/values.yaml
index d9f8be4..58ca552 100644
--- a/mcord-release/mcord-setup/values.yaml
+++ b/mcord-release/mcord-setup/values.yaml
@@ -18,7 +18,12 @@
initimage: aweimeow/multus-sriov
image: aweimeow/multus-sriov
-sriov:
- name: sriov
+sriov_vfio:
+ name: sriov_vfio
devicepci: 04:00.0
devicetype: vfio
+
+sriov_netdevice:
+ name: sriov_netdevice
+ devicepci: 04:00.0
+ devicetype: netdevice