AETHER-1805 Add support of VLAN in UPF interfaces
Change-Id: I351323fed8a8476e1112674f78cdc273481aee75
diff --git a/omec/omec-user-plane/Chart.yaml b/omec/omec-user-plane/Chart.yaml
index 9f370b7..1eb313e 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.13
+version: 0.3.14
diff --git a/omec/omec-user-plane/templates/networks.yaml b/omec/omec-user-plane/templates/networks.yaml
index 528ee99..a448a20 100644
--- a/omec/omec-user-plane/templates/networks.yaml
+++ b/omec/omec-user-plane/templates/networks.yaml
@@ -16,6 +16,9 @@
spec:
config: '{
"cniVersion": "0.3.1",
+ {{- if hasKey .Values.config.upf.access "vlan" }}
+ "vlan": {{ .Values.config.upf.access.vlan }},
+ {{- end }}
"type": {{ .Values.config.upf.cniPlugin | quote }},
"ipam": {
"type": {{ .Values.config.upf.ipam | quote }}
@@ -34,6 +37,9 @@
spec:
config: '{
"cniVersion": "0.3.1",
+ {{- if hasKey .Values.config.upf.core "vlan" }}
+ "vlan": {{ .Values.config.upf.core.vlan }},
+ {{- end }}
"type": {{ .Values.config.upf.cniPlugin | quote }},
"ipam": {
"type": {{ .Values.config.upf.ipam | quote }}
diff --git a/omec/omec-user-plane/values.yaml b/omec/omec-user-plane/values.yaml
index f8ba6cb..ea376a3 100644
--- a/omec/omec-user-plane/values.yaml
+++ b/omec/omec-user-plane/values.yaml
@@ -71,10 +71,12 @@
gateway: 192.168.252.1
ip: 192.168.252.3/24
#mac:
+ #vlan:
core:
gateway: 192.168.250.1
ip: 192.168.250.3/24
#mac:
+ #vlan:
cfgFiles:
upf.json:
mode: dpdk