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 portName to Operator and Webhooks for Consistency #664

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+94 −90
Open

Add portName to Operator and Webhooks for Consistency #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ $ helm repo add kedacore https://kedacore.github.io/charts
$ helm search repo kedacore
NAME CHART VERSION APP VERSION DESCRIPTION
kedacore/external-scaler-azure-cosmos-db 0.1.0 0.1.0 Event-based autoscaler for Azure Cosmos DB chan...
kedacore/keda 2.14.2 2.14.0 Event-based autoscaler for workloads on Kubernetes
kedacore/keda 2.15.0 2.14.0 Event-based autoscaler for workloads on Kubernetes
kedacore/keda-add-ons-http 0.8.0 0.8.0 Event-based autoscaler for HTTP workloads on Ku...
```

Expand Down
158 changes: 79 additions & 79 deletions docs/index.yaml
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified docs/keda-2.14.2.tgz
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion keda/templates/manager/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ spec:
ports:
{{- if .Values.prometheus.operator.enabled }}
- containerPort: {{ .Values.prometheus.operator.port }}
name: metrics
name: {{ .Values.prometheus.operator.portName }}
protocol: TCP
{{- end }}
- containerPort: 9666
Expand Down
2 changes: 1 addition & 1 deletion keda/templates/manager/podmonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ metadata:
{{- end }}
spec:
podMetricsEndpoints:
- port: metrics
- port: {{ .Values.prometheus.operator.portName }}
path: /metrics
{{- with .Values.prometheus.operator.podMonitor.interval }}
interval: {{ . }}
Expand Down
2 changes: 1 addition & 1 deletion keda/templates/manager/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion keda/templates/manager/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
{{- toYaml . | nindent 4 }}
{{- end }}
endpoints:
- port: {{ .Values.prometheus.operator.serviceMonitor.port }}
- port: {{ .Values.prometheus.operator.portName }}
{{- with .Values.prometheus.operator.serviceMonitor.targetPort }}
targetPort: {{ . }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion keda/templates/webhooks/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,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:
Expand Down
2 changes: 1 addition & 1 deletion keda/templates/webhooks/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion keda/templates/webhooks/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
{{- toYaml . | nindent 4 }}
{{- end }}
endpoints:
- port: {{ .Values.prometheus.webhooks.serviceMonitor.port }}
- port: {{ .Values.prometheus.webhooks.portName }}
{{- with .Values.prometheus.webhooks.serviceMonitor.targetPort }}
targetPort: {{ . }}
{{- end }}
Expand Down
10 changes: 7 additions & 3 deletions keda/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ prometheus:
targetLabels: []
# -- PodTargetLabels transfers labels on the Kubernetes `Pod` onto the created metrics
podTargetLabels: []
# -- Name of the service port this endpoint refers to. Mutually exclusive with targetPort
# -- DEPRECATED. ServiceMonitor port name will be the same as `metricServer.portName`
port: metrics
# -- Name or number of the target port of the Pod behind the Service, the port must be specified with container port property. Mutually exclusive with port
targetPort: ""
Expand Down Expand Up @@ -655,6 +655,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
Expand All @@ -664,7 +666,7 @@ prometheus:
targetLabels: []
# -- PodTargetLabels transfers labels on the Kubernetes `Pod` onto the created metrics
podTargetLabels: []
# -- Name of the service port this endpoint refers to. Mutually exclusive with targetPort
# -- DEPRECATED. ServiceMonitor port name will be the same as `operator.portName`
port: metrics
# -- Name or number of the target port of the Pod behind the Service,
# the port must be specified with container port property. Mutually exclusive with port
Expand Down Expand Up @@ -726,6 +728,8 @@ prometheus:
enabled: false
# -- Port used for exposing KEDA admission webhooks prometheus metrics
port: 8080
# -- HTTP port name for exposing webhooks prometheus metrics
portName: metrics
serviceMonitor:
# -- Enables ServiceMonitor creation for the Prometheus webhooks
enabled: false
Expand All @@ -735,7 +739,7 @@ prometheus:
targetLabels: []
# -- PodTargetLabels transfers labels on the Kubernetes `Pod` onto the created metrics
podTargetLabels: []
# -- Name of the service port this endpoint refers to. Mutually exclusive with targetPort
# -- DEPRECATED. ServiceMonitor port name will be the same as `webhooks.portName`
port: metrics
# -- Name or number of the target port of the Pod behind the Service, the port must be specified with container port property. Mutually exclusive with port
targetPort: ""
Expand Down
Loading