Merge branch '43189-deployed-ingress-configmap-does-not-enable-metrics' into 'master'

Fully enable nginx-ingress metrics Closes #43189 See merge request gitlab-org/gitlab-ce!17069

Merge branch '43189-deployed-ingress-configmap-does-not-enable-metrics' into 'master'
e68305c9 · Kamil Trzciński · Mark Fletcher · 8e93617e · e68305c9
Commit e68305c9 authored Feb 13, 2018 by Kamil Trzciński Committed by Mark Fletcher Feb 14, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

values.yaml vendor/ingress/values.yaml +2 -1

No files found.
--- a/vendor/ingress/values.yaml
+++ b/vendor/ingress/values.yaml
@@ -2,7 +2,8 @@ controller:
  image:
    tag: "0.10.2"
    repository: "quay.io/kubernetes-ingress-controller/nginx-ingress-controller"
-  stats.enabled: true
+  stats:
+    enabled: true
  podAnnotations:
    prometheus.io/scrape: "true"
    prometheus.io/port: "10254"