diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-13 20:18:56 +0300 |
|---|---|---|
| committer | Mark Fletcher <mark@gitlab.com> | 2018-02-14 14:50:30 +0300 |
| commit | e68305c96c6f2b31978101997faeb91a751e064b (patch) | |
| tree | 62c13294032e6ba53a4baa8dae327bd5b53fe547 /vendor | |
| parent | 8e93617ed5e9b89c62fef53c8fa664f3bc034866 (diff) | |
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
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/ingress/values.yaml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vendor/ingress/values.yaml b/vendor/ingress/values.yaml index cdb7da77e86..a6b499953bf 100644 --- 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" |