AETHER-1805 Consolidate access and core SRIOV resources

Also, remove unnecessary headless service

Change-Id: Ib6ab82c16ccc6325e3fbb4693e7670affb63aee8
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