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

Add appProtocol to services collecting metrics using mTLS #688

Merged
merged 2 commits into from
Nov 7, 2024
Merged

Add appProtocol to services collecting metrics using mTLS #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
889e537
Added appProtocol
guicholeo Sep 12, 2024
2a08305
Merge branch 'main' into feature/add-app-protocol-to-services
guicholeo Sep 26, 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
3 changes: 3 additions & 0 deletions keda/templates/manager/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ spec:
- name: metrics
port: {{ .Values.prometheus.operator.port }}
targetPort: {{ .Values.prometheus.operator.port }}
{{- with .Values.prometheus.operator.appProtocol }}
appProtocol: {{ . }}
{{- end }}
{{- end }}
{{- if .Values.profiling.operator.enabled }}
- name: profiling
Expand Down
3 changes: 3 additions & 0 deletions keda/templates/metrics-server/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ spec:
port: {{ .Values.prometheus.metricServer.port }}
targetPort: {{ .Values.prometheus.metricServer.port }}
protocol: TCP
{{- with .Values.prometheus.metricServer.appProtocol }}
appProtocol: {{ . }}
{{- end }}
{{- if .Values.profiling.metricsServer.enabled }}
- name: profiling
port: {{ .Values.profiling.metricsServer.port }}
Expand Down
3 changes: 3 additions & 0 deletions keda/templates/webhooks/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ spec:
- name: {{ .Values.prometheus.webhooks.serviceMonitor.port }}
port: {{ .Values.prometheus.webhooks.port }}
targetPort: {{ .Values.prometheus.webhooks.port }}
{{- with .Values.prometheus.webhooks.appProtocol }}
appProtocol: {{ . }}
{{- end }}
{{- end }}
{{- if .Values.profiling.webhooks.enabled }}
- name: profiling
Expand Down
6 changes: 6 additions & 0 deletions keda/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,8 @@ prometheus:
port: 8080
# -- HTTP port name for exposing metrics server prometheus metrics
portName: metrics
# -- App Protocol for service when scraping metrics endpoint
# appProtocol: http
serviceMonitor:
# -- Enables ServiceMonitor creation for the Prometheus Operator
enabled: false
Expand Down Expand Up @@ -654,6 +656,8 @@ prometheus:
enabled: false
# -- Port used for exposing KEDA Operator prometheus metrics
port: 8080
# -- App Protocol for service when scraping metrics endpoint
# appProtocol: http
serviceMonitor:
# -- Enables ServiceMonitor creation for the Prometheus Operator
enabled: false
Expand Down Expand Up @@ -725,6 +729,8 @@ prometheus:
enabled: false
# -- Port used for exposing KEDA admission webhooks prometheus metrics
port: 8080
# -- App Protocol for service when scraping metrics endpoint
# appProtocol: http
serviceMonitor:
# -- Enables ServiceMonitor creation for the Prometheus webhooks
enabled: false
Expand Down
Loading