summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-02-05 12:48:17 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2018-02-05 12:48:17 +0000
commitbedfc7b103c25cd6b9aada350142549160e41a5e (patch)
tree04667b18ca58bdfb18ce28672c3a93a49c53d70e /vendor
parent518c9628a3c15920f7e92df3099f3827bee3aa5c (diff)
parent1f912880dbf6337718611edbd9c2fb52c5639476 (diff)
downloadgitlab-ce-bedfc7b103c25cd6b9aada350142549160e41a5e.tar.gz
Merge branch '39985-enable-prometheus-metrics-for-deployed-ingresses' into 'master'
Enable Prometheus metrics for deployed Ingresses Closes #39985 See merge request gitlab-org/gitlab-ce!16866
Diffstat (limited to 'vendor')
-rw-r--r--vendor/ingress/values.yaml8
1 files changed, 8 insertions, 0 deletions
diff --git a/vendor/ingress/values.yaml b/vendor/ingress/values.yaml
new file mode 100644
index 00000000000..cdb7da77e86
--- /dev/null
+++ b/vendor/ingress/values.yaml
@@ -0,0 +1,8 @@
+controller:
+ image:
+ tag: "0.10.2"
+ repository: "quay.io/kubernetes-ingress-controller/nginx-ingress-controller"
+ stats.enabled: true
+ podAnnotations:
+ prometheus.io/scrape: "true"
+ prometheus.io/port: "10254"