[stable/jenkins] Ability to set custom namespace for ServiceMonitor (#16145)

* Improved ServiceMonitor for stable/jenkins

 - Added custom namespace where to deploy the ServiceMonitor
 - Updated README to reflect the new variable
 - Increase Chart version

Signed-off-by: Alejandro Garrido Mota <garridomota@gmail.com>

* Bump Chart version and added variable in values.yaml

Signed-off-by: Alejandro Garrido Mota <garridomota@gmail.com>

stable/jenkins/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: jenkins
 home: https://jenkins.io/
-version: 1.5.0
+version: 1.5.1
 appVersion: lts
 description: Open source continuous integration server. It supports multiple SCM tools
   including CVS, Subversion and Git. It can execute Apache Ant and Apache Maven-based

stable/jenkins/README.md

@@ -155,6 +155,7 @@ The following tables list the configurable parameters of the Jenkins chart and t
 | `master.lifecycle`                | Lifecycle specification for master-container | Not set                           |
 | `master.prometheus.enabled`       | Enables prometheus service monitor | `false`                                     |
 | `master.prometheus.serviceMonitorAdditionalLabels` | Additional labels to add to the service monitor object | `{}`                       |
+| `master.prometheus.serviceMonitorNamespace` | Custom namespace for serviceMonitor | Not set (same ns where is Jenkins being deployed) |
 | `master.prometheus.scrapeInterval` | How often prometheus should scrape metrics | `60s`                              |
 | `master.prometheus.scrapeEndpoint` | The endpoint prometheus should get metrics from | `/prometheus`                 |
 | `master.prometheus.alertingrules` | Array of prometheus alerting rules | `[]`                                        |

stable/jenkins/templates/jenkins-master-servicemonitor.yaml

@@ -4,7 +4,11 @@ kind: ServiceMonitor
 
 metadata:
   name: {{ template "jenkins.fullname" . }}
+{{- if .Values.master.prometheus.serviceMonitorNamespace }}
+  namespace: {{ .Values.master.prometheus.serviceMonitorNamespace }}
+{{- else }}
   namespace: {{ template "jenkins.namespace" . }}
+{{- end }}
   labels:
     "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
     "helm.sh/chart": "{{ .Chart.Name }}-{{ .Chart.Version }}"

stable/jenkins/values.yaml

@@ -335,6 +335,8 @@ master:
     enabled: false
     # Additional labels to add to the ServiceMonitor object
     serviceMonitorAdditionalLabels: {}
+    # Set a custom namespace where to deploy ServiceMonitor resource
+    # serviceMonitorNamespace: monitoring
     scrapeInterval: 60s
     # This is the default endpoint used by the prometheus plugin
     scrapeEndpoint: /prometheus