COMAC-164 Do not allocate one interface to multiple resource pools
Also changed default image repo to official omecproject repo.
Change-Id: Icd7fb7eb6d8337780d08fae2035319b38868491b
diff --git a/mcord-release/mcord-setup/Chart.yaml b/mcord-release/mcord-setup/Chart.yaml
index afdf2fd..06fb83b 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.2
+version: 0.1.3
diff --git a/mcord-release/mcord-setup/templates/NOTES.txt b/mcord-release/mcord-setup/templates/NOTES.txt
index a059f77..8304746 100644
--- a/mcord-release/mcord-setup/templates/NOTES.txt
+++ b/mcord-release/mcord-setup/templates/NOTES.txt
@@ -16,12 +16,6 @@
*/ -}}
Congratulations! You have installed SR-IOV network device plugin into your Kubernetes cluster.
-
-Your configurations for SR-IOV network device plugin as following:
-
- 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
diff --git a/mcord-release/mcord-setup/templates/sriov-conf.yaml b/mcord-release/mcord-setup/templates/sriov-conf.yaml
index fcc0f24..df303bb 100644
--- a/mcord-release/mcord-setup/templates/sriov-conf.yaml
+++ b/mcord-release/mcord-setup/templates/sriov-conf.yaml
@@ -1,18 +1,20 @@
----
-# Copyright 2018-present Open Networking Foundation
-# Copyright 2018 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+{{/*
+Copyright 2018-present Open Networking Foundation
+Copyright 2018 Intel Corporation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/}}
+
---
kind: ConfigMap
apiVersion: v1
@@ -22,19 +24,5 @@
data:
config.json: |
{
- "resourceList":
- [
- {
- "resourceName": {{ .Values.sriov_vfio.name | quote }},
- "rootDevices": [{{ .Values.sriov_vfio.devicepci | quote }}],
- "sriovMode": true,
- "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 }}
- }
- ]
+ "resourceList": {{ toJson .Values.resourceList }}
}
diff --git a/mcord-release/mcord-setup/values.yaml b/mcord-release/mcord-setup/values.yaml
index 58ca552..b19f9f7 100644
--- a/mcord-release/mcord-setup/values.yaml
+++ b/mcord-release/mcord-setup/values.yaml
@@ -1,4 +1,3 @@
----
# Copyright 2018-present Open Networking Foundation
# Copyright 2018 Intel Corporation
#
@@ -15,15 +14,24 @@
# limitations under the License.
sriovds:
- initimage: aweimeow/multus-sriov
- image: aweimeow/multus-sriov
+ initimage: docker.io/omecproject/omec-cni:0.0.1
+ image: docker.io/omecproject/omec-cni:0.0.1
-sriov_vfio:
- name: sriov_vfio
- devicepci: 04:00.0
- devicetype: vfio
-
-sriov_netdevice:
- name: sriov_netdevice
- devicepci: 04:00.0
- devicetype: netdevice
+# We need to speficy both pfName and driver name to prevent one interface to be
+# allocated to multiple resource pools
+resourceList:
+ - resourceName: sriov_vfio
+ # Provide vfio-pci bounded physical function names in your cluster under "pfNames"
+ # Do not change "drivers" unless you know what you're doing
+ selectors:
+ pfNames:
+ - eno1
+ drivers:
+ - vfio-pci
+ - resourceName: sriov_netdevice
+ # Provide pfNames and their drivers that serve virtual functions in your cluster
+ selectors:
+ pfNames:
+ - eno1
+ drivers:
+ - ixgbevf