[prometheus] use named targetport (#6097)

Signed-off-by: drfaust92 <[email protected]>
Signed-off-by: Ilia Lazebnik <[email protected]>
Signed-off-by: zeritti <[email protected]>
Co-authored-by: zeritti <[email protected]>

Author: DrFaust92

charts/prometheus/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: prometheus
 # renovate: github=prometheus/prometheus
 appVersion: v3.5.0
-version: 27.35.0
+version: 27.36.0
 kubeVersion: ">=1.19.0-0"
 description: Prometheus is a monitoring system and time series database.
 home: https://prometheus.io/

charts/prometheus/templates/NOTES.txt

@@ -25,7 +25,7 @@ Get the Prometheus server URL by running these commands in the same shell:
   echo http://$SERVICE_IP:{{ .Values.server.service.servicePort }}
 {{- else if contains "ClusterIP"  .Values.server.service.type }}
   export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "prometheus.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 9090
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME {{ include "prometheus.port" . }}
 {{- end }}
 
 

charts/prometheus/templates/_helpers.tpl

@@ -6,6 +6,13 @@ Expand the name of the chart.
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{/*
+Return the port for prometheus.
+*/}}
+{{- define "prometheus.port" -}}
+9090
+{{- end -}}
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}

charts/prometheus/templates/deploy.yaml

@@ -112,9 +112,9 @@ spec:
           {{- end }}
           args:
             - --watched-dir=/etc/config
-          {{- $default_url := "http://127.0.0.1:9090/-/reload" }}
+          {{- $default_url := (printf "http://127.0.0.1:%s/-/reload" (include "prometheus.port" .)) }}
           {{- with .Values.server.prefixURL }}
-          {{- $default_url = printf "http://127.0.0.1:9090%s/-/reload" . }}
+          {{- $default_url = printf "http://127.0.0.1:%s%s/-/reload" (include "prometheus.port" .) . }}
           {{- end }}
           {{- if .Values.configmapReload.prometheus.containerPort }}
             - --listen-address=0.0.0.0:{{ .Values.configmapReload.prometheus.containerPort }}
@@ -224,7 +224,7 @@ spec:
           {{- end }}
         {{- end }}
           ports:
-            - containerPort: 9090
+            - containerPort: {{ include "prometheus.port" . }}
           {{- if .Values.server.portName }}
               name: {{ .Values.server.portName }}
           {{- end }}
@@ -235,15 +235,15 @@ spec:
             {{- if not .Values.server.tcpSocketProbeEnabled }}
             httpGet:
               path: {{ .Values.server.prefixURL }}/-/ready
-              port: 9090
+              port: {{ default (include "prometheus.port" .) .Values.server.portName }}
               scheme: {{ .Values.server.probeScheme }}
               {{- with .Values.server.probeHeaders }}
               httpHeaders:
 {{- toYaml . | nindent 14 }}
               {{- end }}
             {{- else }}
             tcpSocket:
-              port: 9090
+              port: {{ default (include "prometheus.port" .) .Values.server.portName }}
             {{- end }}
             initialDelaySeconds: {{ .Values.server.readinessProbeInitialDelay }}
             periodSeconds: {{ .Values.server.readinessProbePeriodSeconds }}
@@ -254,15 +254,15 @@ spec:
             {{- if not .Values.server.tcpSocketProbeEnabled }}
             httpGet:
               path: {{ .Values.server.prefixURL }}/-/healthy
-              port: 9090
+              port: {{ default (include "prometheus.port" .) .Values.server.portName }}
               scheme: {{ .Values.server.probeScheme }}
               {{- with .Values.server.probeHeaders }}
               httpHeaders:
 {{- toYaml . | nindent 14 }}
               {{- end }}
             {{- else }}
             tcpSocket:
-              port: 9090
+              port: {{ default (include "prometheus.port" .) .Values.server.portName }}
             {{- end }}
             initialDelaySeconds: {{ .Values.server.livenessProbeInitialDelay }}
             periodSeconds: {{ .Values.server.livenessProbePeriodSeconds }}
@@ -274,7 +274,7 @@ spec:
             {{- if not .Values.server.tcpSocketProbeEnabled }}
             httpGet:
               path: {{ .Values.server.prefixURL }}/-/healthy
-              port: 9090
+              port: {{ default (include "prometheus.port" .) .Values.server.portName }}
               scheme: {{ .Values.server.probeScheme }}
               {{- if .Values.server.probeHeaders }}
               httpHeaders:
@@ -285,7 +285,7 @@ spec:
               {{- end }}
             {{- else }}
             tcpSocket:
-              port: 9090
+              port: {{ default (include "prometheus.port" .) .Values.server.portName }}
             {{- end }}
             failureThreshold: {{ .Values.server.startupProbe.failureThreshold }}
             periodSeconds: {{ .Values.server.startupProbe.periodSeconds }}

charts/prometheus/templates/headless-svc.yaml

@@ -19,7 +19,7 @@ spec:
     - name: http
       port: {{ .Values.server.statefulSet.headless.servicePort }}
       protocol: TCP
-      targetPort: 9090
+      targetPort: {{ default (include "prometheus.port" .) .Values.server.portName }}
     {{- if .Values.server.statefulSet.headless.gRPC.enabled }}
     - name: grpc
       port: {{ .Values.server.statefulSet.headless.gRPC.servicePort }}

charts/prometheus/templates/network-policy.yaml

@@ -12,5 +12,5 @@ spec:
       {{- include "prometheus.server.matchLabels" . | nindent 6 }}
   ingress:
     - ports:
-      - port: 9090
+      - port: {{ default (include "prometheus.port" .) .Values.server.portName }}
 {{- end }}

charts/prometheus/templates/service.yaml

@@ -37,7 +37,7 @@ spec:
     - name: http
       port: {{ .Values.server.service.servicePort }}
       protocol: TCP
-      targetPort: 9090
+      targetPort: {{ default (include "prometheus.port" .) .Values.server.portName }}
     {{- if ( and (eq .Values.server.service.type "NodePort" ) (not (empty .Values.server.service.nodePort)) ) }}
       nodePort: {{ .Values.server.service.nodePort }}
     {{- end }}