AETHER-1747 Allow UPF service type configurable
Change-Id: I7568d1316c0e65b9a3e44fdd5d54786b84ff09a7
diff --git a/omec/omec-user-plane/Chart.yaml b/omec/omec-user-plane/Chart.yaml
index 69b2ff0..524ed09 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.19
+version: 0.3.20
diff --git a/omec/omec-user-plane/templates/service-upf.yaml b/omec/omec-user-plane/templates/service-upf.yaml
index fa3d897..321197e 100644
--- a/omec/omec-user-plane/templates/service-upf.yaml
+++ b/omec/omec-user-plane/templates/service-upf.yaml
@@ -12,6 +12,7 @@
labels:
{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
spec:
+ type: {{ .Values.service.type }}
selector:
{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
ports:
@@ -22,29 +23,17 @@
apiVersion: v1
kind: Service
metadata:
- name: upf-external
+ name: upf-http
labels:
{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
spec:
+ type: {{ .Values.service.type }}
selector:
{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
- type: NodePort
ports:
- name: bess-web
protocol: TCP
port: 8000
- nodePort: {{ .Values.config.upf.bess.web.nodePort }}
----
-apiVersion: v1
-kind: Service
-metadata:
- name: upf-metrics
- labels:
-{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
-spec:
- selector:
-{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
- ports:
- name: prometheus-exporter
protocol: TCP
port: 8080
diff --git a/omec/omec-user-plane/values.yaml b/omec/omec-user-plane/values.yaml
index 00cd2d1..467eccf 100644
--- a/omec/omec-user-plane/values.yaml
+++ b/omec/omec-user-plane/values.yaml
@@ -85,9 +85,9 @@
core:
ifname: core
measure: true
- bess:
- web:
- nodePort: 32001
+
+service:
+ type: ClusterIP
servicemonitor:
enabled: false