Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Prometheus metrics handling for the operator. #555

Merged
merged 2 commits into from
Jan 18, 2024
Merged

Fix Prometheus metrics handling for the operator. #555

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3f22bc
Fix Prometheus metrics handling for the operator.
mplzik Oct 30, 2023
404710c
Merge branch 'main' into mplzik/operator-add-metrics-port
JorTurFer Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions keda/templates/manager/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ spec:
- "--webhooks-service-name={{ .Values.webhooks.name }}"
- "--k8s-cluster-name={{ .Values.clusterName }}"
- "--k8s-cluster-domain={{ .Values.clusterDomain }}"
- "--enable-prometheus-metrics={{ .Values.prometheus.operator.enabled }}"
{{- if .Values.prometheus.operator.enabled }}
- "--metrics-bind-address=:{{ .Values.prometheus.operator.port }}"
- "--enable-prometheus-metrics={{ .Values.prometheus.operator.enabled }}"
{{- end }}
{{- if .Values.opentelemetry.operator.enabled }}
- "--enable-opentelemetry-metrics={{ .Values.opentelemetry.operator.enabled}}"
Expand Down Expand Up @@ -126,9 +126,11 @@ spec:
failureThreshold: {{ .Values.operator.readinessProbe.failureThreshold }}
successThreshold: {{ .Values.operator.readinessProbe.successThreshold }}
ports:
- containerPort: 8080
name: http
{{- if .Values.prometheus.operator.enabled }}
- containerPort: {{ .Values.prometheus.operator.port }}
name: metrics
protocol: TCP
{{- end }}
- containerPort: 9666
name: metricsservice
protocol: TCP
Expand Down
Loading