Add namespace value nginx ingress (helm#10980)

* add servicemonitor namespace value Signed-off-by: git config --global --edit <[email protected]> * update readme and chart version Signed-off-by: git config --global --edit <[email protected]>
agolo · Feb 15, 2019 · ea08884 · ea08884
1 parent 5586b43
commit ea08884
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml
@@ -1,5 +1,5 @@
 name: nginx-ingress
-version: 1.3.0
+version: 1.3.1
 appVersion: 0.22.0
 home: https://github.com/kubernetes/ingress-nginx
 description: An nginx Ingress controller that uses ConfigMap to store the nginx configuration.

diff --git a/stable/nginx-ingress/README.md b/stable/nginx-ingress/README.md
@@ -127,6 +127,7 @@ Parameter | Description | Default
 `controller.metrics.service.type` | type of Prometheus metrics service to create | `ClusterIP`
 `controller.metrics.serviceMonitor.enabled` | Set this to `true` to create ServiceMonitor for Prometheus operator | `false`
 `controller.metrics.serviceMonitor.additionalLabels` | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus | `{}`
+`controller.metrics.serviceMonitor.namespace` | namespace where servicemonitor resource should be created | `the same namespace as nginx ingress`
 `controller.customTemplate.configMapName` | configMap containing a custom nginx template | `""`
 `controller.customTemplate.configMapKey` | configMap key containing the nginx template | `""`
 `controller.headers` | configMap key:value pairs containing the [custom headers](https://github.com/kubernetes/ingress-nginx/tree/master/docs/examples/customization/custom-headers) for Nginx | `{}`

diff --git a/stable/nginx-ingress/templates/controller-servicemonitor.yaml b/stable/nginx-ingress/templates/controller-servicemonitor.yaml
@@ -3,6 +3,9 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "nginx-ingress.controller.fullname" . }}
+  {{- if .Values.controller.metrics.serviceMonitor.namespace }}
+  namespace: {{ .Values.controller.metrics.serviceMonitor.namespace }}
+  {{- end }}
   labels:
     app: {{ template "nginx-ingress.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}

diff --git a/stable/nginx-ingress/values.yaml b/stable/nginx-ingress/values.yaml
@@ -279,6 +279,7 @@ controller:
     serviceMonitor:
       enabled: false
       additionalLabels: {}
+      namespace: ""
 
   lifecycle: {}