commit 7ee8ae82c9951f675a39e2cb909b6129f5c0a366
author Hyunsun Moon <hyunsun.moon@gmail.com> Sat Aug 14 18:21:59 2021 -0700
committer Hyunsun Moon <hyunsun.moon@gmail.com> Sat Aug 14 18:21:59 2021 -0700
tree e2ffa77ba0f648852489e6ad9b2acff539463629
parent 418dd5a8f8ebf47714f32c0c8248c54de8b91423

AETHER-2063 Allow specifying SRIOV resource name for each of UPF user plane interfaces

Change-Id: I755f08eeca2462c22ac2c8f0a5f65a17556fcd67

omec/omec-user-plane/templates/networks.yaml

diff --git a/omec/omec-user-plane/templates/networks.yaml b/omec/omec-user-plane/templates/networks.yaml
index cac4e18..a5e5d73 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: {{ .Values.config.upf.sriov.resourceName }}
+    k8s.v1.cni.cncf.io/resourceName: {{ .Values.config.upf.access.resourceName }}
 {{- end }}
 spec:
   config: '{
@@ -38,7 +38,7 @@
   name: core-net
 {{- if $.Values.config.upf.sriov.enabled }}
   annotations:
-    k8s.v1.cni.cncf.io/resourceName: {{ .Values.config.upf.sriov.resourceName }}
+    k8s.v1.cni.cncf.io/resourceName: {{ .Values.config.upf.core.resourceName }}
 {{- end }}
 spec:
   config: '{

omec/omec-user-plane/templates/statefulset-upf.yaml

diff --git a/omec/omec-user-plane/templates/statefulset-upf.yaml b/omec/omec-user-plane/templates/statefulset-upf.yaml
index 303f27b..8bf1cf8 100644
--- a/omec/omec-user-plane/templates/statefulset-upf.yaml
+++ b/omec/omec-user-plane/templates/statefulset-upf.yaml
@@ -107,7 +107,12 @@
             hugepages-1Gi: 2Gi
           {{- end }}
           {{- if .Values.config.upf.sriov.enabled }}
-            {{ .Values.config.upf.sriov.resourceName }}: 2
+          {{- if eq .Values.config.upf.access.resourceName .Values.config.upf.core.resourceName }}
+            {{ .Values.config.upf.access.resourceName }}: 2
+          {{- else }}
+            {{ .Values.config.upf.access.resourceName }}: 1
+            {{ .Values.config.upf.core.resourceName }}: 1
+          {{- end }}
           {{- end }}
           limits:
           {{- if .Values.resources.enabled }}
@@ -117,7 +122,12 @@
             hugepages-1Gi: 2Gi
           {{- end }}
           {{- if .Values.config.upf.sriov.enabled }}
-            {{ .Values.config.upf.sriov.resourceName }}: 2
+          {{- if eq .Values.config.upf.access.resourceName .Values.config.upf.core.resourceName }}
+            {{ .Values.config.upf.access.resourceName }}: 2
+          {{- else }}
+            {{ .Values.config.upf.access.resourceName }}: 1
+            {{ .Values.config.upf.core.resourceName }}: 1
+          {{- end }}
           {{- end }}
         env:
           - name: CONF_FILE