AETHER-1942 Add an ability to set external IP for bess-upf and pfcp-agent
Change-Id: Ic40e37d7789993c3d16a2e9062f5b0a210aa156a
diff --git a/omec/omec-upf-pfcp-agent/Chart.yaml b/omec/omec-upf-pfcp-agent/Chart.yaml
index a21fcbf..81cc458 100644
--- a/omec/omec-upf-pfcp-agent/Chart.yaml
+++ b/omec/omec-upf-pfcp-agent/Chart.yaml
@@ -7,4 +7,4 @@
name: omec-upf-pfcp-agent
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.1.7
+version: 0.1.8
diff --git a/omec/omec-upf-pfcp-agent/templates/service-pfcp-agent.yaml b/omec/omec-upf-pfcp-agent/templates/service-pfcp-agent.yaml
index a1f956b..2a4f1eb 100644
--- a/omec/omec-upf-pfcp-agent/templates/service-pfcp-agent.yaml
+++ b/omec/omec-upf-pfcp-agent/templates/service-pfcp-agent.yaml
@@ -11,29 +11,19 @@
name: pfcp-agent
labels:
{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 4 }}
-spec:
- type: ClusterIP
- selector:
-{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 4 }}
- ports:
- - name: pfcp
- port: 8805
- protocol: UDP
-{{- if .Values.config.nodePort.enabled }}
----
-apiVersion: v1
-kind: Service
-metadata:
- name: pfcp-agent-external
- labels:
-{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 4 }}
-spec:
- type: NodePort
- selector:
-{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 4 }}
- ports:
- - name: pfcp
- port: 8805
- protocol: UDP
- nodePort: {{ .Values.config.nodePort.port }}
+{{- with .Values.service.annotations }}
+ annotations:
+ {{- toYaml . | nindent 4 }}
{{- end }}
+spec:
+ type: {{ .Values.service.type }}
+{{- if .Values.service.externalIp }}
+ externalIPs:
+ - {{ .Values.service.externalIp }}
+{{- end }}
+ selector:
+{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 4 }}
+ ports:
+ - name: pfcp
+ port: 8805
+ protocol: UDP
diff --git a/omec/omec-upf-pfcp-agent/values.yaml b/omec/omec-upf-pfcp-agent/values.yaml
index 2ed658f..29a71c4 100644
--- a/omec/omec-upf-pfcp-agent/values.yaml
+++ b/omec/omec-upf-pfcp-agent/values.yaml
@@ -31,9 +31,6 @@
coreDump:
enabled: false
path: /tmp/coredump
- nodePort:
- enabled: false
- port: 30805
pfcp:
cfgFiles:
upf.json:
@@ -43,3 +40,7 @@
access_ip: "172.17.0.1/32"
p4rtc_server: "onos-tost-onos-classic-hs.tost"
p4rtc_port: "51001"
+service:
+ type: ClusterIP
+ #externalIp:
+ #annotations:
diff --git a/omec/omec-user-plane/Chart.yaml b/omec/omec-user-plane/Chart.yaml
index 7e7536a..4f7ceab 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.23
+version: 0.3.24
diff --git a/omec/omec-user-plane/templates/service-upf.yaml b/omec/omec-user-plane/templates/service-upf.yaml
index ea23935..38ada87 100644
--- a/omec/omec-user-plane/templates/service-upf.yaml
+++ b/omec/omec-user-plane/templates/service-upf.yaml
@@ -17,6 +17,10 @@
{{- end }}
spec:
type: {{ .Values.service.type }}
+{{- if .Values.service.externalIp }}
+ externalIPs:
+ - {{ .Values.service.externalIp }}
+{{- end }}
selector:
{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
ports:
@@ -36,6 +40,10 @@
{{- end }}
spec:
type: {{ .Values.service.type }}
+{{- if .Values.service.externalIp }}
+ externalIPs:
+ - {{ .Values.service.externalIp }}
+{{- end }}
selector:
{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
ports:
diff --git a/omec/omec-user-plane/values.yaml b/omec/omec-user-plane/values.yaml
index d0ff59b..cd01432 100644
--- a/omec/omec-user-plane/values.yaml
+++ b/omec/omec-user-plane/values.yaml
@@ -88,6 +88,7 @@
service:
type: ClusterIP
+ #externalIp:
#annotations:
servicemonitor: