ArmstrongLabs
/
argo-helm
forked from argoproj/argo-helm
1
0
Fork 0
Code Pull Requests Packages Activity

feat(argo-workflows): argo workflows chart to allow set the namespace of Prometheus ServiceMonitor. (#1104) 

* feat(argo-workflows): argo workflows chart to allow set the namespace of Prometheus ServiceMonitor.

Signed-off-by: mugioka <okamugi0722@gmail.com>

* Bump minor chart version

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
main argo-workflows-0.10.0
mugi-o 2022-01-28 22:44:46 +09:00 committed by GitHub
parent cf57a71a15
commit 4c1ee93faf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charts/argo-workflows/Chart.yaml
View File

@ -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.9.5 version: 0.10.0
appVersion: v3.2.6 appVersion: v3.2.6
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: |
- "[Changed]: Consistent .helmignore" - "[Added]: Add controller serviceMonitor.namespace parameter."

1
charts/argo-workflows/README.md
View File

@ -110,6 +110,7 @@ Fields to note:
| controller.serviceLabels | object | `{}` | Optional labels to add to the controller Service | | controller.serviceLabels | object | `{}` | Optional labels to add to the controller Service |
| controller.serviceMonitor.additionalLabels | object | `{}` | Prometheus ServiceMonitor labels | | controller.serviceMonitor.additionalLabels | object | `{}` | Prometheus ServiceMonitor labels |
| controller.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor | | controller.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor |
| controller.serviceMonitor.namespace | string | `""` | Prometheus ServiceMonitor namespace |
| controller.serviceType | string | `"ClusterIP"` | Service type of the controller Service | | controller.serviceType | string | `"ClusterIP"` | Service type of the controller Service |
| controller.telemetryConfig.enabled | bool | `false` | Enables prometheus telemetry server | | controller.telemetryConfig.enabled | bool | `false` | Enables prometheus telemetry server |
| controller.telemetryConfig.path | string | `"/telemetry"` | telemetry path | | controller.telemetryConfig.path | string | `"/telemetry"` | telemetry path |

3
charts/argo-workflows/templates/controller/workflow-controller-servicemonitor.yaml
View File

@ -3,6 +3,9 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ template "argo-workflows.controller.fullname" . }} name: {{ template "argo-workflows.controller.fullname" . }}
{{- with .Values.controller.serviceMonitor.namespace }}
namespace: {{ . }}
{{- end }}
labels: labels:
{{- include "argo-workflows.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }} {{- include "argo-workflows.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
{{- with .Values.controller.serviceMonitor.additionalLabels }} {{- with .Values.controller.serviceMonitor.additionalLabels }}

2
charts/argo-workflows/values.yaml
View File

@ -145,6 +145,8 @@ controller:
enabled: false enabled: false
# -- Prometheus ServiceMonitor labels # -- Prometheus ServiceMonitor labels
additionalLabels: {} additionalLabels: {}
# -- Prometheus ServiceMonitor namespace
namespace: "" # "monitoring"
serviceAccount: serviceAccount:
# -- Create a service account for the controller # -- Create a service account for the controller
create: true create: true