AETHER-724 Add support of static MAC for UPF interfaces
Change-Id: I46485e90ee4af1cb062d8e3a101237a9be7a1a59
diff --git a/omec/omec-user-plane/Chart.yaml b/omec/omec-user-plane/Chart.yaml
index 49e9ac4..bc79c96 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.5
+version: 0.3.6
diff --git a/omec/omec-user-plane/templates/networks.yaml b/omec/omec-user-plane/templates/networks.yaml
index 37f54e7..53a57cb 100644
--- a/omec/omec-user-plane/templates/networks.yaml
+++ b/omec/omec-user-plane/templates/networks.yaml
@@ -15,13 +15,12 @@
{{- end }}
spec:
config: '{
-{{- if semverCompare ">=1.16-0" .Capabilities.KubeVersion.GitVersion }}
"cniVersion": "0.3.1",
-{{- end }}
"type": {{ .Values.config.upf.cniPlugin | quote }},
"ipam": {
"type": {{ .Values.config.upf.ipam | quote }}
- }
+ },
+ "capabilities": { "mac": true}
}'
---
apiVersion: "k8s.cni.cncf.io/v1"
@@ -34,11 +33,10 @@
{{- end }}
spec:
config: '{
-{{- if semverCompare ">=1.16-0" .Capabilities.KubeVersion.GitVersion }}
"cniVersion": "0.3.1",
-{{- end }}
"type": {{ .Values.config.upf.cniPlugin | quote }},
"ipam": {
"type": {{ .Values.config.upf.ipam | quote }}
- }
+ },
+ "capabilities": { "mac": true}
}'
diff --git a/omec/omec-user-plane/templates/statefulset-upf.yaml b/omec/omec-user-plane/templates/statefulset-upf.yaml
index 9285cd7..3ac3239 100644
--- a/omec/omec-user-plane/templates/statefulset-upf.yaml
+++ b/omec/omec-user-plane/templates/statefulset-upf.yaml
@@ -29,20 +29,18 @@
{
"name": "access-net",
"interface": {{ index $accessConfig "ifname" | quote }},
-{{- if semverCompare ">=1.16-0" .Capabilities.KubeVersion.GitVersion }}
+ {{- if hasKey .Values.config.upf.access "mac" }}
+ "mac": {{ .Values.config.upf.access.mac | quote }},
+ {{- end }}
"ips": [{{ .Values.config.upf.access.ip | quote }}]
-{{- else }}
- "ips": {{ .Values.config.upf.access.ip | quote }}
-{{- end }}
},
{
"name": "core-net",
"interface": {{ index $coreConfig "ifname" | quote }},
-{{- if semverCompare ">=1.16-0" .Capabilities.KubeVersion.GitVersion }}
+ {{- if hasKey .Values.config.upf.core "mac" }}
+ "mac": {{ .Values.config.upf.core.mac | quote }},
+ {{- end }}
"ips": [{{ .Values.config.upf.core.ip | quote }}]
-{{- else }}
- "ips": {{ .Values.config.upf.core.ip | quote }}
-{{- end }}
}
]'
spec:
diff --git a/omec/omec-user-plane/values.yaml b/omec/omec-user-plane/values.yaml
index d1bc16c..60f1448 100644
--- a/omec/omec-user-plane/values.yaml
+++ b/omec/omec-user-plane/values.yaml
@@ -71,9 +71,11 @@
access:
gateway: 192.168.252.1
ip: 192.168.252.3/24
+ #mac:
core:
gateway: 192.168.250.1
ip: 192.168.250.3/24
+ #mac:
cfgFiles:
upf.json:
mode: dpdk