commit 834c28fc24acb1c26efcf824c52484c3c6f4d74f
author Hyunsun Moon <hyunsun@opennetworking.org> Thu Dec 05 18:26:22 2019 -0800
committer Hyunsun Moon <hyunsun@opennetworking.org> Mon Dec 09 22:10:28 2019 +0000
tree 3a2e27ee2ce90d635442c9bcef75a6c49f5f1483
parent cd58a7ba050a738f22b52a37926db1dcbc914636

EDGEPOD-60 Add support of multiple UPFs

- Enable configuring multiple UPF mode
- Add support of ZMQ mode when multple UPF enabled
- Change to create three types of services for each application,
  cluster IP, headless, and external

Change-Id: Ic004a4ff7cdc5708d28ce2717677041f71b4d819

omec/omec-control-plane/templates/service-spgwc.yaml

diff --git a/omec/omec-control-plane/templates/service-spgwc.yaml b/omec/omec-control-plane/templates/service-spgwc.yaml
index b406350..fe1e68c 100644
--- a/omec/omec-control-plane/templates/service-spgwc.yaml
+++ b/omec/omec-control-plane/templates/service-spgwc.yaml
@@ -18,39 +18,69 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: spgwc-cp-comm
+  name: spgwc
   labels:
 {{ tuple "spgwc" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 spec:
+  type: ClusterIP
   selector:
 {{ tuple "spgwc" . | include "omec-control-plane.metadata_labels" | indent 4 }}
-{{- if .Values.config.spgwc.cpComm.nodePort.enabled }}
-  type: NodePort
-{{- end }}
   ports:
   - name: cp-comm
-    port: 21
+    port: {{ .Values.config.spgwc.cpComm.port }}
+{{- if .Values.config.spgwc.multiUpfs }}
+    protocol: TCP
+{{- else }}
     protocol: UDP
-  {{- if .Values.config.spgwc.cpComm.nodePort.enabled }}
-    nodePort: {{ .Values.config.spgwc.cpComm.nodePort.port }}
-  {{- end }}
+{{- end }}
+  - name: s11
+    port: {{ .Values.config.spgwc.s11.port }}
+    protocol: UDP
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: spgwc-s11
+  name: spgwc-headless
   labels:
 {{ tuple "spgwc" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 spec:
+  clusterIP: None
   selector:
 {{ tuple "spgwc" . | include "omec-control-plane.metadata_labels" | indent 4 }}
-{{- if .Values.config.spgwc.s11.nodePort.enabled }}
-  type: NodePort
-{{- end }}
   ports:
-  - name: s11
-    port: 2123
+  - name: cp-comm
+    port: {{ .Values.config.spgwc.cpComm.port }}
+{{- if .Values.config.spgwc.multiUpfs }}
+    protocol: TCP
+{{- else }}
     protocol: UDP
-  {{- if .Values.config.spgwc.s11.nodePort.enabled }}
-    nodePort: {{ .Values.config.spgwc.s11.nodePort.port }}
-  {{- end }}
+{{- end }}
+  - name: s11
+    port: {{ .Values.config.spgwc.s11.port }}
+    protocol: UDP
+{{- if not .Values.config.spgwc.multiUpfs }}
+{{- if or .Values.config.spgwc.cpComm.nodePort.enabled .Values.config.spgwc.s11.nodePort.enabled }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: spgwc-external
+  labels:
+{{ tuple "spgwc" . | include "omec-control-plane.metadata_labels" | indent 4 }}
+spec:
+  type: NodePort
+  selector:
+{{ tuple "spgwc" . | include "omec-control-plane.metadata_labels" | indent 4 }}
+  ports:
+{{- if .Values.config.spgwc.cpComm.nodePort.enabled }}
+  - name: cp-comm
+    port: {{ .Values.config.spgwc.cpComm.port }}
+    protocol: TCP
+{{- end }}
+{{- if .Values.config.spgwc.s11.nodePort.enabled }}
+  - name: s11
+    port: {{ .Values.config.spgwc.s11.port }}
+    protocol: UDP
+{{- end }}
+{{- end }}
+{{- end }}