COMAC-168,COMAC-171 Assign static IP to S1U and SGI iface on SPGWU
SPGWC requires S1U address of SPGWU in its configuration. When they are
deployed in a separate cluster, SPGWC cannot consult K8S for the IP
address like it is doing now. This is a temporary fix until we add an
ability to support multiple instances of SPGWU and load balancer for them.
Also, rename/restructued network related values in omec-data-plane/values.yaml
and use the values directly from configmap instead of passing them as an
environment variable.
Change-Id: Ib02017408c1671e9a003b0f6dc77e4b4d5dad070
diff --git a/omec/omec-data-plane/templates/bin/_spgwu-setup-af-iface.sh.tpl b/omec/omec-data-plane/templates/bin/_spgwu-setup-af-iface.sh.tpl
index ad8eded..714d79c 100644
--- a/omec/omec-data-plane/templates/bin/_spgwu-setup-af-iface.sh.tpl
+++ b/omec/omec-data-plane/templates/bin/_spgwu-setup-af-iface.sh.tpl
@@ -17,8 +17,8 @@
set -ex
-UL_IFACE="{{- .Values.config.spgwu.s1uAfDev -}}"
-DL_IFACE="{{- .Values.config.spgwu.sgiAfDev -}}"
+UL_IFACE="{{ .Values.config.spgwu.s1u.device }}-veth"
+DL_IFACE="{{ .Values.config.spgwu.sgi.device }}-veth"
if ! ip link show $UL_IFACE; then
s1u_mac=$(ip addr show dev s1u-net | awk '$1=="link/ether"{print $2}')