Added prometheus port name

kedacore · Nov 13, 2023 · d36d852 · d36d852
1 parent 56f161c
commit d36d852
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/keda/templates/manager/deployment.yaml b/keda/templates/manager/deployment.yaml
@@ -119,12 +119,14 @@ spec:
             failureThreshold: {{ .Values.operator.readinessProbe.failureThreshold }}
             successThreshold: {{ .Values.operator.readinessProbe.successThreshold }}
           ports:
-          - containerPort: 8080
-            name: http
-            protocol: TCP
           - containerPort: 9666
             name: metricsservice
             protocol: TCP
+          {{- if .Values.prometheus.operator.enabled }}
+          - containerPort: {{ .Values.prometheus.operator.port }}
+            name: {{ .Values.prometheus.operator.portName }}
+            protocol: TCP
+          {{- end }}
           env:
             - name: WATCH_NAMESPACE
               value: {{ .Values.watchNamespace | quote }}

diff --git a/keda/templates/manager/service.yaml b/keda/templates/manager/service.yaml
@@ -30,7 +30,7 @@ spec:
     port: 9666
     targetPort: 9666
   {{- if .Values.prometheus.operator.enabled }}
-  - name: metrics
+  - name: {{ .Values.prometheus.operator.portName }}
     port: {{ .Values.prometheus.operator.port }}
     targetPort: {{ .Values.prometheus.operator.port }}
   {{- end }}

diff --git a/keda/templates/metrics-server/servicemonitor.yaml b/keda/templates/metrics-server/servicemonitor.yaml
@@ -29,7 +29,7 @@ spec:
   {{- toYaml . | nindent 4 }}
   {{- end }}
   endpoints:
-  - port: {{ .Values.prometheus.metricServer.portName }}
+  - port: {{ .Values.prometheus.metricServer.serviceMonitor.port }}
     {{- with .Values.prometheus.metricServer.serviceMonitor.targetPort }}
     targetPort: {{ . }}
     {{- end }}

diff --git a/keda/templates/webhooks/deployment.yaml b/keda/templates/webhooks/deployment.yaml
@@ -110,7 +110,7 @@ spec:
             protocol: TCP
           {{- if .Values.prometheus.webhooks.enabled }}
           - containerPort: {{ .Values.prometheus.webhooks.port }}
-            name: metrics
+            name: {{ .Values.prometheus.webhooks.portName }}
             protocol: TCP
           {{- end }}
           env:

diff --git a/keda/templates/webhooks/service.yaml b/keda/templates/webhooks/service.yaml
@@ -32,7 +32,7 @@ spec:
     protocol: TCP
     targetPort: {{ .Values.webhooks.port | default 9443 }}
   {{- if .Values.prometheus.webhooks.enabled }}
-  - name: {{ .Values.prometheus.webhooks.serviceMonitor.port }}
+  - name: {{ .Values.prometheus.webhooks.portName }}
     port: {{ .Values.prometheus.webhooks.port }}
     targetPort: {{ .Values.prometheus.webhooks.port }}
   {{- end }}

diff --git a/keda/values.yaml b/keda/values.yaml
@@ -563,6 +563,8 @@ prometheus:
     enabled: false
     # -- Port used for exposing KEDA Operator prometheus metrics
     port: 8080
+    # -- HTTP port name for exposing KEDA Operator prometheus metrics
+    portName: metrics
     serviceMonitor:
       # -- Enables ServiceMonitor creation for the Prometheus Operator
       enabled: false
@@ -622,6 +624,8 @@ prometheus:
     enabled: false
     # -- Port used for exposing KEDA admission webhooks prometheus metrics
     port: 8080
+    # -- HTTP port name for KEDA admission webhooks prometheus metrics
+    portName: metrics
     serviceMonitor:
       # -- Enables ServiceMonitor creation for the Prometheus webhooks
       enabled: false