From 98d8c55e16bc02386a532206dbc9e6f9aae6c138 Mon Sep 17 00:00:00 2001 From: Julien Duchesne Date: Fri, 17 Sep 2021 13:48:46 -0400 Subject: [PATCH] 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 --- .../templates/controller/workflow-controller-deployment.yaml | 2 +- charts/argo-workflows/values.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml b/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml index 7dee67e5..1cd28df2 100644 --- a/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml +++ b/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml @@ -75,7 +75,7 @@ spec: resources: {{- toYaml .Values.controller.resources | nindent 12 }} ports: - - name: metrics + - name: {{ .Values.controller.metricsConfig.portName }} containerPort: {{ .Values.controller.metricsConfig.port }} - containerPort: 6060 livenessProbe: {{ .Values.controller.livenessProbe | toYaml | nindent 12 }} diff --git a/charts/argo-workflows/values.yaml b/charts/argo-workflows/values.yaml index f87b3364..735ecb44 100644 --- a/charts/argo-workflows/values.yaml +++ b/charts/argo-workflows/values.yaml @@ -57,6 +57,7 @@ controller: enabled: false path: /metrics port: 9090 + portName: metrics servicePort: 8080 servicePortName: metrics # the controller container's securityContext