COMAC-283 Decouple SRIOV device plugin from omec-data-plane
Change-Id: Idf43e06300254fe997692d5a21df895597794219
diff --git a/omec/omec-data-plane/Chart.yaml b/omec/omec-data-plane/Chart.yaml
index 2cca094..11ea877 100644
--- a/omec/omec-data-plane/Chart.yaml
+++ b/omec/omec-data-plane/Chart.yaml
@@ -15,7 +15,6 @@
# limitations under the License.
apiVersion: v1
-appVersion: "1.0"
description: OMEC data plane services
name: omec-data-plane
-version: 0.1.4
+version: 0.1.5
diff --git a/omec/omec-data-plane/templates/configmap-sriov-conf.yaml b/omec/omec-data-plane/templates/configmap-sriov-conf.yaml
deleted file mode 100644
index 655d200..0000000
--- a/omec/omec-data-plane/templates/configmap-sriov-conf.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-{{/*
-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.
-*/}}
-
-{{- if .Values.config.sriov.enabled }}
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
- name: sriov-config
-data:
- config.json: |
- {
- "resourceList": [
- {
- "resourceName": "sriov_vfio",
- "selectors": {
- "pfNames": {{ toJson .Values.config.sriov.resourceList.vfio.pfNames }},
- "drivers": ["vfio-pci"]
- }
- }
-{{- if hasKey .Values.config.sriov.resourceList "netDevice" }}
- ,
- {
- "resourceName": "sriov_netdevice",
- "selectors": {
- "pfNames": {{ toJson .Values.config.sriov.resourceList.netDevice.pfNames }},
- "drivers": {{ toJson .Values.config.sriov.resourceList.netDevice.drivers }}
- }
- }
-{{- end }}
- ]
- }
-{{- end }}
diff --git a/omec/omec-data-plane/templates/daemonset-sriov-dp.yaml b/omec/omec-data-plane/templates/daemonset-sriov-dp.yaml
deleted file mode 100644
index ca75a36..0000000
--- a/omec/omec-data-plane/templates/daemonset-sriov-dp.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-{{/*
-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.
-*/}}
-
-{{- if .Values.config.sriov.enabled }}
----
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
- name: sriov-device-plugin
-spec:
- selector:
- matchLabels:
- name: sriov-device-plugin
- template:
- metadata:
- labels:
- name: sriov-device-plugin
- spec:
- hostNetwork: true
- hostPID: true
- initContainers:
- - name: init-sriov-cni
- image: {{ .Values.images.tags.omecCni }}
- imagePullPolicy: {{ .Values.images.pullPolicy }}
- command: [ "bash", "-c" ]
- args:
- - cp /tmp/cni/bin/{sriov,vfioveth,jq,static} /host/opt/cni/bin/
- volumeMounts:
- - name: cni-bin
- mountPath: /host/opt/cni/bin
- containers:
- - name: sriov-device-plugin
- image: {{ .Values.images.tags.sriovDp }}
- imagePullPolicy: {{ .Values.images.pullPolicy }}
- command: [ "/bin/sh", "-c", "--" ]
- args: [ "sriovdp --logtostderr 10;" ]
- securityContext:
- privileged: true
- volumeMounts:
- - mountPath: /var/lib/kubelet/
- name: devicesock
- readOnly: false
- - mountPath: /sys
- name: net
- readOnly: true
- - name: sriov-config
- mountPath: /etc/pcidp
- volumes:
- - name: devicesock
- hostPath:
- path: /var/lib/kubelet/
- - name: net
- hostPath:
- path: /sys
- - name: sriov-config
- configMap:
- name: sriov-config
- - name: cni-bin
- hostPath:
- path: /opt/cni/bin
-{{- end }}
diff --git a/omec/omec-data-plane/values.yaml b/omec/omec-data-plane/values.yaml
index cf80731..78a69dc 100644
--- a/omec/omec-data-plane/values.yaml
+++ b/omec/omec-data-plane/values.yaml
@@ -17,7 +17,6 @@
tags:
init: docker.io/omecproject/pod-init:1.0.0
omecCni: docker.io/omecproject/omec-cni:1.0.0
- sriovDp: docker.io/nfvpe/sriov-device-plugin:v3.0.0
spgwu: docker.io/omecproject/ngic-dp:1.0.0
depCheck: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pullPolicy: IfNotPresent
@@ -41,24 +40,6 @@
config:
sriov:
enabled: true
- # Provide interface used as a SR-IOV PF
- # If your cluster has multiple nodes with different interface names,
- # simply provide the whole list
- resourceList:
- # Provide PF name with its VFs are bounded to vfio-pci driver
- vfio:
- pfNames:
- - eno1
- # Provide PF name with its VFs bounded to PF's driver
- # The driver name must be specified to prevent one interface is
- # registered to both vfio and netdevice resource pools
- # NOTE: netDevice is required to use CDN service
- netDevice:
- pfNames:
- - eno1
- drivers:
- - i40evf
- - ixgbevf
spgwu:
# Provide the S1U and SGI networks facing device name and IP address
s1u: