diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-13 17:18:56 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-13 17:18:56 +0000 |
| commit | 49b41879423966f0ed6d931766d0779f055dfa5b (patch) | |
| tree | d58c8f0dda93e7bf8ae09b1a990900af0eb57894 /vendor | |
| parent | 480b957e943696b95cae0a7d8b779fe9b2051d8e (diff) | |
| parent | 2535ab2a040618ee2236ea026c415ee58034b3cf (diff) | |
| download | gitlab-ce-49b41879423966f0ed6d931766d0779f055dfa5b.tar.gz | |
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" |