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/networks.yaml b/omec/omec-data-plane/templates/networks.yaml
index a82e3ae..c2e4a95 100644
--- a/omec/omec-data-plane/templates/networks.yaml
+++ b/omec/omec-data-plane/templates/networks.yaml
@@ -28,15 +28,7 @@
config: '{
"type": {{ .Values.networks.cniPlugin | quote }},
"ipam": {
- "type": {{ .Values.networks.ipam | quote }},
- {{- if eq .Values.networks.ipam "host-local" }}
- "subnet": {{ .Values.networks.s1u.subnet | quote }},
- "gateway": {{ .Values.networks.s1u.gateway | quote }}
- {{- else if eq .Values.networks.ipam "centralip" }}
- "ipType": "cluster",
- "network": {{ .Values.networks.s1u.subnet | quote }},
- "etcdURL": {{ .Values.networks.etcdurl | quote }}
- {{- end }}
+ "type": {{ .Values.networks.ipam | quote }}
}
}'
---
@@ -52,14 +44,6 @@
config: '{
"type": {{ .Values.networks.cniPlugin | quote }},
"ipam": {
- "type": {{ .Values.networks.ipam | quote }},
- {{- if eq .Values.networks.ipam "host-local" }}
- "subnet": {{ .Values.networks.sgi.subnet | quote }},
- "gateway": {{ .Values.networks.sgi.gateway | quote }}
- {{- else if eq .Values.networks.ipam "centralip" }}
- "ipType": "cluster",
- "network": {{ .Values.networks.sgi.subnet | quote }},
- "etcdURL": {{ .Values.networks.etcdurl | quote }}
- {{- end }}
+ "type": {{ .Values.networks.ipam | quote }}
}
}'