AETHER-2075 [5g-control-plane] Fix monitoring target down alerts
Removed Prometheus service monitor annotation and ports for unimplemented NFs.
Also, refactored Service template.
Change-Id: I105e4ae05baf4f819c881c7e1c6b74064b0a7d6b
diff --git a/omec/5g-control-plane/templates/service-nrf.yaml b/omec/5g-control-plane/templates/service-nrf.yaml
index cbe45d1..07fcfe3 100644
--- a/omec/5g-control-plane/templates/service-nrf.yaml
+++ b/omec/5g-control-plane/templates/service-nrf.yaml
@@ -13,31 +13,16 @@
labels:
{{ tuple "nrf" . | include "5g-control-plane.metadata_labels" | indent 4 }}
spec:
- type: ClusterIP
+ type: {{ .Values.config.nrf.serviceType }}
selector:
{{ tuple "nrf" . | include "5g-control-plane.metadata_labels" | indent 4 }}
ports:
- name: sbi
port: {{ .Values.config.nrf.sbi.port }}
protocol: TCP
-{{- if or .Values.config.nrf.sbi.nodePort.enabled }}
----
-apiVersion: v1
-kind: Service
-metadata:
- name: nrf-external
- labels:
-{{ tuple "nrf" . | include "5g-control-plane.metadata_labels" | indent 4 }}
-spec:
- type: NodePort
- selector:
-{{ tuple "nrf" . | include "5g-control-plane.metadata_labels" | indent 4 }}
- ports:
-{{- if .Values.config.nrf.sbi.nodePort.enabled }}
- - name: sbi
- port: {{ .Values.config.nrf.sbi.port }}
- protocol: TCP
- nodePort: {{ .Values.config.nrf.sbi.nodePort.port }}
+{{- if eq .Values.config.nrf.serviceType "NodePort" }}
+{{- if .Values.config.nrf.sbi.nodePort }}
+ nodePort: {{ .Values.config.nrf.sbi.nodePort }}
{{- end }}
{{- end }}
{{- end }}