diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-27 09:49:59 +0000 |
|---|---|---|
| committer | Ian Baum <ibaum@gitlab.com> | 2018-03-06 16:18:56 -0600 |
| commit | efefd65c809f92ae5880f4c9c5e2666137f65958 (patch) | |
| tree | 833a494669baf9da516b73eae5ebfa22b2274355 | |
| parent | 9240f84b59d21166840b55abac40311e31232f30 (diff) | |
| download | gitlab-ce-efefd65c809f92ae5880f4c9c5e2666137f65958.tar.gz | |
Merge branch '43261-fix-prometheus-installation' into 'master'
Disable RBAC on Prometheus values.yml
Closes #43621
See merge request gitlab-org/gitlab-ce!17372
| -rw-r--r-- | changelogs/unreleased/43261-fix-prometheus-installation.yml | 5 | ||||
| -rw-r--r-- | vendor/prometheus/values.yaml | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changelogs/unreleased/43261-fix-prometheus-installation.yml b/changelogs/unreleased/43261-fix-prometheus-installation.yml new file mode 100644 index 00000000000..b5fc7980390 --- /dev/null +++ b/changelogs/unreleased/43261-fix-prometheus-installation.yml @@ -0,0 +1,5 @@ +--- +title: Allow Prometheus application to be installed from Cluster applications +merge_request: 17372 +author: +type: fixed diff --git a/vendor/prometheus/values.yaml b/vendor/prometheus/values.yaml index db967514be7..859f2ad82a4 100644 --- a/vendor/prometheus/values.yaml +++ b/vendor/prometheus/values.yaml @@ -10,6 +10,9 @@ nodeExporter: pushgateway: enabled: false +rbac: + create: false + server: image: tag: v2.1.0 |