feat(argo-workflows): Allow setting the metrics port name (#934)
* Allow setting the metrics port name Here, we scrape every pod that has a .*-metrics port here But the helm chart is locked to `metrics` which our Prometheus doesn't see This PR will make it configurable with a default value of `metrics` Signed-off-by: Julien Duchesne <julien.duchesne@grafana.com> * Bump version Signed-off-by: Julien Duchesne <julien.duchesne@grafana.com> * Bump minor version Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com> Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
This commit is contained in:
parent
7477b33cba
commit
c7584ab51d
3 changed files with 4 additions and 3 deletions
|
@ -2,7 +2,7 @@ apiVersion: v2
|
||||||
name: argo-workflows
|
name: argo-workflows
|
||||||
description: A Helm chart for Argo Workflows
|
description: A Helm chart for Argo Workflows
|
||||||
type: application
|
type: application
|
||||||
version: 0.5.2
|
version: 0.6.0
|
||||||
appVersion: "v3.1.8"
|
appVersion: "v3.1.8"
|
||||||
icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
|
icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
|
||||||
home: https://github.com/argoproj/argo-helm
|
home: https://github.com/argoproj/argo-helm
|
||||||
|
@ -15,4 +15,4 @@ maintainers:
|
||||||
- name: benjaminws
|
- name: benjaminws
|
||||||
annotations:
|
annotations:
|
||||||
artifacthub.io/changes: |
|
artifacthub.io/changes: |
|
||||||
- "[Added]: Add controller initialDelay param to configmap"
|
- "[Added]: Add controller metricsConfig.portName parameter"
|
||||||
|
|
|
@ -75,7 +75,7 @@ spec:
|
||||||
resources:
|
resources:
|
||||||
{{- toYaml .Values.controller.resources | nindent 12 }}
|
{{- toYaml .Values.controller.resources | nindent 12 }}
|
||||||
ports:
|
ports:
|
||||||
- name: metrics
|
- name: {{ .Values.controller.metricsConfig.portName }}
|
||||||
containerPort: {{ .Values.controller.metricsConfig.port }}
|
containerPort: {{ .Values.controller.metricsConfig.port }}
|
||||||
- containerPort: 6060
|
- containerPort: 6060
|
||||||
livenessProbe: {{ .Values.controller.livenessProbe | toYaml | nindent 12 }}
|
livenessProbe: {{ .Values.controller.livenessProbe | toYaml | nindent 12 }}
|
||||||
|
|
|
@ -57,6 +57,7 @@ controller:
|
||||||
enabled: false
|
enabled: false
|
||||||
path: /metrics
|
path: /metrics
|
||||||
port: 9090
|
port: 9090
|
||||||
|
portName: metrics
|
||||||
servicePort: 8080
|
servicePort: 8080
|
||||||
servicePortName: metrics
|
servicePortName: metrics
|
||||||
# the controller container's securityContext
|
# the controller container's securityContext
|
||||||
|
|
Loading…
Reference in a new issue