COMAC-283 Decouple SRIOV device plugin from omec-data-plane
Change-Id: Idf43e06300254fe997692d5a21df895597794219
diff --git a/omec/omec-data-plane-cni/.helmignore b/omec/omec-data-plane-cni/.helmignore
new file mode 100644
index 0000000..f0c1319
--- /dev/null
+++ b/omec/omec-data-plane-cni/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/omec/omec-data-plane-cni/Chart.yaml b/omec/omec-data-plane-cni/Chart.yaml
new file mode 100644
index 0000000..154abd9
--- /dev/null
+++ b/omec/omec-data-plane-cni/Chart.yaml
@@ -0,0 +1,19 @@
+---
+# Copyright 2019-present Open Networking Foundation
+#
+# 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.
+
+apiVersion: v1
+description: CNI setup for OMEC data plane
+name: omec-data-plane-cni
+version: 1.0.0
diff --git a/omec/omec-data-plane-cni/templates/_helpers.tpl b/omec/omec-data-plane-cni/templates/_helpers.tpl
new file mode 100644
index 0000000..451f9c0
--- /dev/null
+++ b/omec/omec-data-plane-cni/templates/_helpers.tpl
@@ -0,0 +1,25 @@
+{{- /*
+# Copyright 2019-present Open Networking Foundation
+#
+# 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.
+*/ -}}
+
+{{/*
+Renders a set of standardised labels.
+*/}}
+{{- define "omec-data-plane-cni.metadata_labels" -}}
+{{- $application := index . 0 -}}
+{{- $context := index . 1 -}}
+release: {{ $context.Release.Name }}
+app: {{ $application }}
+{{- end -}}
diff --git a/omec/omec-data-plane/templates/configmap-sriov-conf.yaml b/omec/omec-data-plane-cni/templates/configmap-sriov-conf.yaml
similarity index 96%
rename from omec/omec-data-plane/templates/configmap-sriov-conf.yaml
rename to omec/omec-data-plane-cni/templates/configmap-sriov-conf.yaml
index 655d200..6b625ed 100644
--- a/omec/omec-data-plane/templates/configmap-sriov-conf.yaml
+++ b/omec/omec-data-plane-cni/templates/configmap-sriov-conf.yaml
@@ -15,7 +15,6 @@
limitations under the License.
*/}}
-{{- if .Values.config.sriov.enabled }}
---
kind: ConfigMap
apiVersion: v1
@@ -44,4 +43,3 @@
{{- end }}
]
}
-{{- end }}
diff --git a/omec/omec-data-plane/templates/daemonset-sriov-dp.yaml b/omec/omec-data-plane-cni/templates/daemonset-sriov-plugin.yaml
similarity index 80%
rename from omec/omec-data-plane/templates/daemonset-sriov-dp.yaml
rename to omec/omec-data-plane-cni/templates/daemonset-sriov-plugin.yaml
index ca75a36..4bafb4f 100644
--- a/omec/omec-data-plane/templates/daemonset-sriov-dp.yaml
+++ b/omec/omec-data-plane-cni/templates/daemonset-sriov-plugin.yaml
@@ -15,25 +15,28 @@
limitations under the License.
*/}}
-{{- if .Values.config.sriov.enabled }}
---
apiVersion: apps/v1
kind: DaemonSet
metadata:
- name: sriov-device-plugin
+ name: omec-sriov-plugin
+ labels:
+{{ tuple "omec-sriov-plugin" . | include "omec-data-plane-cni.metadata_labels" | indent 4 }}
spec:
selector:
matchLabels:
- name: sriov-device-plugin
+{{ tuple "omec-sriov-plugin" . | include "omec-data-plane-cni.metadata_labels" | indent 6 }}
template:
metadata:
labels:
- name: sriov-device-plugin
+{{ tuple "omec-sriov-plugin" . | include "omec-data-plane-cni.metadata_labels" | indent 8 }}
spec:
hostNetwork: true
hostPID: true
+ nodeSelector:
+ beta.kubernetes.io/arch: amd64
initContainers:
- - name: init-sriov-cni
+ - name: init-omec-sriov-plugin
image: {{ .Values.images.tags.omecCni }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
command: [ "bash", "-c" ]
@@ -44,7 +47,7 @@
mountPath: /host/opt/cni/bin
containers:
- name: sriov-device-plugin
- image: {{ .Values.images.tags.sriovDp }}
+ image: {{ .Values.images.tags.sriovPlugin }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
command: [ "/bin/sh", "-c", "--" ]
args: [ "sriovdp --logtostderr 10;" ]
@@ -72,4 +75,3 @@
- name: cni-bin
hostPath:
path: /opt/cni/bin
-{{- end }}
diff --git a/omec/omec-data-plane-cni/values.yaml b/omec/omec-data-plane-cni/values.yaml
new file mode 100644
index 0000000..9b0d814
--- /dev/null
+++ b/omec/omec-data-plane-cni/values.yaml
@@ -0,0 +1,40 @@
+# Copyright 2019-present Open Networking Foundation
+#
+# 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.
+
+images:
+ tags:
+ omecCni: docker.io/omecproject/omec-cni:1.0.0
+ sriovPlugin: docker.io/nfvpe/sriov-device-plugin:v3.0.0
+ pullPolicy: IfNotPresent
+
+config:
+ sriov:
+ # 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
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/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: