Merge branch '45070-prometheus-integration-via-kubernetes-is-broken' into 'master'

Override Prometheus service name to fix integration with GitLab. Closes #45070 See merge request gitlab-org/gitlab-ce!18206

Merge branch '45070-prometheus-integration-via-kubernetes-is-broken' into 'master'
a05e475d · Kamil Trzciński · Filipa Lacerda · ae22256c · a05e475d · a05e475d
Commit a05e475d authored Apr 06, 2018 by Kamil Trzciński Committed by Filipa Lacerda Apr 09, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

45070-prometheus-integration-via-kubernetes-is-broken.yml ...45070-prometheus-integration-via-kubernetes-is-broken.yml +5 -0

values.yaml vendor/prometheus/values.yaml +1 -0

No files found.
--- a/changelogs/unreleased/45070-prometheus-integration-via-kubernetes-is-broken.yml
+++ b/changelogs/unreleased/45070-prometheus-integration-via-kubernetes-is-broken.yml
+---
+title: Work around Prometheus Helm chart name changes to fix integration
+merge_request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18206/
+author: joshlambert
+type: fixed
--- a/vendor/prometheus/values.yaml
+++ b/vendor/prometheus/values.yaml
@@ -14,6 +14,7 @@ rbac:
  create: false

 server:
+  fullnameOverride: "prometheus-prometheus-server"
  image:
    tag: v2.1.0