From 0840816aeff224da043a9eefafe0a3a0b9d1f32b Mon Sep 17 00:00:00 2001 From: Kevin Pullin Date: Thu, 13 Dec 2018 01:50:55 -0800 Subject: [PATCH] nginx-ingress - Support labels on the metrics service (#8561) Signed-off-by: Kevin Pullin --- stable/nginx-ingress/Chart.yaml | 2 +- stable/nginx-ingress/README.md | 1 + stable/nginx-ingress/templates/controller-metrics-service.yaml | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml index fc6f2ca0be..f5e52ad964 100644 --- a/stable/nginx-ingress/Chart.yaml +++ b/stable/nginx-ingress/Chart.yaml @@ -1,5 +1,5 @@ name: nginx-ingress -version: 1.0.1 +version: 1.0.2 appVersion: 0.21.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 index 0b9a8821a0..974804b823 100644 --- a/stable/nginx-ingress/README.md +++ b/stable/nginx-ingress/README.md @@ -118,6 +118,7 @@ Parameter | Description | Default `controller.metrics.service.annotations` | annotations for Prometheus metrics service | `{}` `controller.metrics.service.clusterIP` | cluster IP address to assign to service | `""` `controller.metrics.service.externalIPs` | Prometheus metrics service external IP addresses | `[]` +`controller.metrics.service.labels` | labels for metrics service | `{}` `controller.metrics.service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `""` `controller.metrics.service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to load balancer (if supported) | `[]` `controller.metrics.service.servicePort` | Prometheus metrics service port | `9913` diff --git a/stable/nginx-ingress/templates/controller-metrics-service.yaml b/stable/nginx-ingress/templates/controller-metrics-service.yaml index c0cd507314..df079fc43a 100644 --- a/stable/nginx-ingress/templates/controller-metrics-service.yaml +++ b/stable/nginx-ingress/templates/controller-metrics-service.yaml @@ -9,6 +9,9 @@ metadata: {{- end }} {{- end }} labels: +{{- if .Values.controller.metrics.service.labels }} +{{ toYaml .Values.controller.metrics.service.labels | indent 4 }} +{{- end }} app: {{ template "nginx-ingress.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version }} component: "{{ .Values.controller.name }}"