diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-06 06:43:34 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-06 06:43:34 +0000 |
commit | 702b4fec317ca7fc4a2894a519aec5a0e95d16b6 (patch) | |
tree | 315dcc0986411563bd29a95ede8038ff49dbbaec | |
parent | b9c62c21c6e1dd06e8b68fff5cfa6b13aaf87ae9 (diff) | |
parent | 8fd61a7e44614a2e4ab24a52d43fe2b676d6532e (diff) | |
download | gitlab-ce-702b4fec317ca7fc4a2894a519aec5a0e95d16b6.tar.gz |
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
-rw-r--r-- | changelogs/unreleased/45070-prometheus-integration-via-kubernetes-is-broken.yml | 5 | ||||
-rw-r--r-- | vendor/prometheus/values.yaml | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/45070-prometheus-integration-via-kubernetes-is-broken.yml b/changelogs/unreleased/45070-prometheus-integration-via-kubernetes-is-broken.yml new file mode 100644 index 00000000000..046785deb3f --- /dev/null +++ b/changelogs/unreleased/45070-prometheus-integration-via-kubernetes-is-broken.yml @@ -0,0 +1,5 @@ +--- +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 diff --git a/vendor/prometheus/values.yaml b/vendor/prometheus/values.yaml index 859f2ad82a4..c432be72163 100644 --- 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 |