diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-06 06:43:34 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-04-09 10:22:53 +0100 |
| commit | a05e475d8661540abfffd9fc4318af1531c5b879 (patch) | |
| tree | 7485fe1ab3168ad1b11c8cefb06241564c16493a | |
| parent | ae22256cbf10bdd468fd752512c66a0835001165 (diff) | |
| download | gitlab-ce-a05e475d8661540abfffd9fc4318af1531c5b879.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 |