AETHER-1805 Consolidate access and core SRIOV resources

Also, remove unnecessary headless service

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