commit 1905a6ee9a4a4675aedda64cdd6666185dc3f65a
author Hyunsun Moon <hyunsun@opennetworking.org> Mon Nov 09 05:59:55 2020 +0000
committer Hyunsun Moon <hyunsun@opennetworking.org> Fri Nov 20 08:09:50 2020 +0000
tree a1cb62fe086931f8e658748a3b7e81b1aee2b1d0
parent c72ed4c1dd32e06c1f74f231a265ae91683e43bf

AETHER-724 Add support of static MAC for UPF interfaces

Change-Id: I46485e90ee4af1cb062d8e3a101237a9be7a1a59

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 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: