AETHER-1805 Consolidate access and core SRIOV resources
Also, remove unnecessary headless service
Change-Id: Ib6ab82c16ccc6325e3fbb4693e7670affb63aee8
diff --git a/omec/omec-user-plane/Chart.yaml b/omec/omec-user-plane/Chart.yaml
index d47e2a8..97d66ab 100644
--- a/omec/omec-user-plane/Chart.yaml
+++ b/omec/omec-user-plane/Chart.yaml
@@ -7,4 +7,4 @@
name: omec-user-plane
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.3.11
+version: 0.3.12
diff --git a/omec/omec-user-plane/templates/networks.yaml b/omec/omec-user-plane/templates/networks.yaml
index 53a57cb..29dc77f 100644
--- a/omec/omec-user-plane/templates/networks.yaml
+++ b/omec/omec-user-plane/templates/networks.yaml
@@ -11,7 +11,7 @@
name: access-net
{{- if $.Values.config.upf.sriov.enabled }}
annotations:
- k8s.v1.cni.cncf.io/resourceName: intel.com/sriov_vfio_access_net
+ k8s.v1.cni.cncf.io/resourceName: intel.com/sriov_vfio_net
{{- end }}
spec:
config: '{
@@ -29,7 +29,7 @@
name: core-net
{{- if $.Values.config.upf.sriov.enabled }}
annotations:
- k8s.v1.cni.cncf.io/resourceName: intel.com/sriov_vfio_core_net
+ k8s.v1.cni.cncf.io/resourceName: intel.com/sriov_vfio_net
{{- end }}
spec:
config: '{
diff --git a/omec/omec-user-plane/templates/service-upf.yaml b/omec/omec-user-plane/templates/service-upf.yaml
index c2eabdd..fa3d897 100644
--- a/omec/omec-user-plane/templates/service-upf.yaml
+++ b/omec/omec-user-plane/templates/service-upf.yaml
@@ -8,17 +8,6 @@
apiVersion: v1
kind: Service
metadata:
- name: upf-headless
- labels:
-{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
-spec:
- clusterIP: None
- selector:
-{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
----
-apiVersion: v1
-kind: Service
-metadata:
name: upf
labels:
{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
diff --git a/omec/omec-user-plane/templates/statefulset-upf.yaml b/omec/omec-user-plane/templates/statefulset-upf.yaml
index 0bf4cfa..b53743c 100644
--- a/omec/omec-user-plane/templates/statefulset-upf.yaml
+++ b/omec/omec-user-plane/templates/statefulset-upf.yaml
@@ -107,8 +107,7 @@
hugepages-1Gi: 2Gi
{{- end }}
{{- if .Values.config.upf.sriov.enabled }}
- intel.com/sriov_vfio_access_net: 1
- intel.com/sriov_vfio_core_net: 1
+ intel.com/sriov_vfio_net: 2
{{- end }}
limits:
{{- if .Values.resources.enabled }}
@@ -118,8 +117,7 @@
hugepages-1Gi: 2Gi
{{- end }}
{{- if .Values.config.upf.sriov.enabled }}
- intel.com/sriov_vfio_access_net: 1
- intel.com/sriov_vfio_core_net: 1
+ intel.com/sriov_vfio_net: 2
{{- end }}
env:
- name: CONF_FILE