Make SRIOV resource name configurable
Change-Id: I1fc843ca449fe6d2adc58d57c4e6e840e95a930d
diff --git a/omec/omec-user-plane/Chart.yaml b/omec/omec-user-plane/Chart.yaml
index e4cde0f..8f18fa4 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.26
+version: 0.3.27
diff --git a/omec/omec-user-plane/templates/networks.yaml b/omec/omec-user-plane/templates/networks.yaml
index 500ab13..97b258c 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/intel_sriov_vfio
+ k8s.v1.cni.cncf.io/resourceName: {{ .Values.config.upf.sriov.resourceName }}
{{- end }}
spec:
config: '{
@@ -35,7 +35,7 @@
name: core-net
{{- if $.Values.config.upf.sriov.enabled }}
annotations:
- k8s.v1.cni.cncf.io/resourceName: intel.com/intel_sriov_vfio
+ k8s.v1.cni.cncf.io/resourceName: {{ .Values.config.upf.sriov.resourceName }}
{{- end }}
spec:
config: '{
diff --git a/omec/omec-user-plane/templates/statefulset-upf.yaml b/omec/omec-user-plane/templates/statefulset-upf.yaml
index 1a77d53..303f27b 100644
--- a/omec/omec-user-plane/templates/statefulset-upf.yaml
+++ b/omec/omec-user-plane/templates/statefulset-upf.yaml
@@ -107,7 +107,7 @@
hugepages-1Gi: 2Gi
{{- end }}
{{- if .Values.config.upf.sriov.enabled }}
- intel.com/intel_sriov_vfio: 2
+ {{ .Values.config.upf.sriov.resourceName }}: 2
{{- end }}
limits:
{{- if .Values.resources.enabled }}
@@ -117,7 +117,7 @@
hugepages-1Gi: 2Gi
{{- end }}
{{- if .Values.config.upf.sriov.enabled }}
- intel.com/intel_sriov_vfio: 2
+ {{ .Values.config.upf.sriov.resourceName }}: 2
{{- end }}
env:
- name: CONF_FILE
diff --git a/omec/omec-user-plane/values.yaml b/omec/omec-user-plane/values.yaml
index aad2459..b7032a4 100644
--- a/omec/omec-user-plane/values.yaml
+++ b/omec/omec-user-plane/values.yaml
@@ -60,6 +60,7 @@
enabled: true
sriov:
enabled: true
+ resourceName: "intel.com/intel_sriov_vfio"
# Dynamic IP allocation is not supported yet
ipam: static
cniPlugin: vfioveth