From 4279a2b0b252c47cfdcd0cd39b47958047644fef Mon Sep 17 00:00:00 2001 From: Nick Kampe Date: Tue, 15 Aug 2023 17:39:10 -0500 Subject: [PATCH 1/6] Update servicemonitor.yaml to allow for namespace to be set Signed-off-by: Nick Kampe --- charts/argo-rollouts/templates/controller/servicemonitor.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/argo-rollouts/templates/controller/servicemonitor.yaml b/charts/argo-rollouts/templates/controller/servicemonitor.yaml index 62713764e..d7ab901e3 100644 --- a/charts/argo-rollouts/templates/controller/servicemonitor.yaml +++ b/charts/argo-rollouts/templates/controller/servicemonitor.yaml @@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: {{ include "argo-rollouts.fullname" . }} - namespace: {{ .Release.Namespace | quote }} + namespace: {{ default .Release.Namespace .Values.controller.metrics.serviceMonitor.namespace | quote }} labels: app.kubernetes.io/component: {{ .Values.controller.component }} {{- include "argo-rollouts.labels" . | nindent 4 }} From 4b306ef39b485858a426b9a14e42ed4e66433f50 Mon Sep 17 00:00:00 2001 From: Nick Kampe Date: Tue, 15 Aug 2023 17:54:15 -0500 Subject: [PATCH 2/6] Update README.md Signed-off-by: Nick Kampe --- charts/argo-rollouts/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/argo-rollouts/README.md b/charts/argo-rollouts/README.md index 4e0287795..5be6919d4 100644 --- a/charts/argo-rollouts/README.md +++ b/charts/argo-rollouts/README.md @@ -94,6 +94,7 @@ For full list of changes please check ArtifactHub [changelog]. | controller.metrics.service.annotations | object | `{}` | Service annotations | | controller.metrics.service.port | int | `8090` | Metrics service port | | controller.metrics.service.portName | string | `"metrics"` | Metrics service port name | +| controller.metrics.serviceMonitor.namespace | string | `""` | Namespace to be used for the ServiceMonitor | | controller.metrics.serviceMonitor.additionalAnnotations | object | `{}` | Annotations to be added to the ServiceMonitor | | controller.metrics.serviceMonitor.additionalLabels | object | `{}` | Labels to be added to the ServiceMonitor | | controller.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor | From e010520d1c287c63723a63b2ce391b4f223fa9e9 Mon Sep 17 00:00:00 2001 From: Nick Kampe Date: Tue, 15 Aug 2023 17:55:43 -0500 Subject: [PATCH 3/6] Update values.yaml Signed-off-by: Nick Kampe --- charts/argo-rollouts/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/argo-rollouts/values.yaml b/charts/argo-rollouts/values.yaml index f9d8e1cfe..b711ee37d 100644 --- a/charts/argo-rollouts/values.yaml +++ b/charts/argo-rollouts/values.yaml @@ -132,6 +132,8 @@ controller: serviceMonitor: # -- Enable a prometheus ServiceMonitor enabled: false + # -- Namespace to be used for the ServiceMonitor + namespace: "" # -- Labels to be added to the ServiceMonitor additionalLabels: {} # -- Annotations to be added to the ServiceMonitor From 8ec6e567f7b566d4c14c57f5d65f309ee62895aa Mon Sep 17 00:00:00 2001 From: Nick Kampe Date: Tue, 15 Aug 2023 17:55:53 -0500 Subject: [PATCH 4/6] Update Chart.yaml Signed-off-by: Nick Kampe --- charts/argo-rollouts/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml index 0bf8dfcb8..8c8ee97c5 100644 --- a/charts/argo-rollouts/Chart.yaml +++ b/charts/argo-rollouts/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v1.5.1 description: A Helm chart for Argo Rollouts name: argo-rollouts -version: 2.31.5 +version: 2.31.6 home: https://github.com/argoproj/argo-helm icon: https://argoproj.github.io/argo-rollouts/assets/logo.png keywords: From f556b829810374e91a8e7ff76d196e70ac009db5 Mon Sep 17 00:00:00 2001 From: Nick Kampe Date: Tue, 15 Aug 2023 17:58:01 -0500 Subject: [PATCH 5/6] Update Chart.yaml Signed-off-by: Nick Kampe --- charts/argo-rollouts/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml index 8c8ee97c5..2aba36f12 100644 --- a/charts/argo-rollouts/Chart.yaml +++ b/charts/argo-rollouts/Chart.yaml @@ -19,4 +19,4 @@ annotations: url: https://argoproj.github.io/argo-helm/pgp_keys.asc artifacthub.io/changes: | - kind: added - description: Add CI example for extra objects + description: Add ability to set namespace on ServiceMonitor resource From 65f37d2d45c9ded20e19c332afdce1c76d49dc69 Mon Sep 17 00:00:00 2001 From: Nick Kampe Date: Tue, 15 Aug 2023 22:07:28 -0500 Subject: [PATCH 6/6] Alphabetized namespace addition in README Signed-off-by: Nick Kampe --- charts/argo-rollouts/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/argo-rollouts/README.md b/charts/argo-rollouts/README.md index 5be6919d4..b91989988 100644 --- a/charts/argo-rollouts/README.md +++ b/charts/argo-rollouts/README.md @@ -94,11 +94,11 @@ For full list of changes please check ArtifactHub [changelog]. | controller.metrics.service.annotations | object | `{}` | Service annotations | | controller.metrics.service.port | int | `8090` | Metrics service port | | controller.metrics.service.portName | string | `"metrics"` | Metrics service port name | -| controller.metrics.serviceMonitor.namespace | string | `""` | Namespace to be used for the ServiceMonitor | | controller.metrics.serviceMonitor.additionalAnnotations | object | `{}` | Annotations to be added to the ServiceMonitor | | controller.metrics.serviceMonitor.additionalLabels | object | `{}` | Labels to be added to the ServiceMonitor | | controller.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor | | controller.metrics.serviceMonitor.metricRelabelings | list | `[]` | MetricRelabelConfigs to apply to samples before ingestion | +| controller.metrics.serviceMonitor.namespace | string | `""` | Namespace to be used for the ServiceMonitor | | controller.metrics.serviceMonitor.relabelings | list | `[]` | RelabelConfigs to apply to samples before scraping | | controller.nodeSelector | object | `{}` | [Node selector] | | controller.pdb.annotations | object | `{}` | Annotations to be added to controller [Pod Disruption Budget] |