diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-15 08:56:08 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-15 08:16:34 -0500 |
| commit | 9f121081d647b97565899171153011d5b0cf6914 (patch) | |
| tree | f5cf0149c688c6cd23b439a7abd18b80a14bacfe | |
| parent | d8d10b29b22133d9a6381027bdc181f061ed1dbb (diff) | |
| download | gitlab-ce-9f121081d647b97565899171153011d5b0cf6914.tar.gz | |
Merge branch '46286-fix-ingress-rbac-default-value' into 'master'
Disable RBAC on Ingress by default
Closes #46286
See merge request gitlab-org/gitlab-ce!18947
| -rw-r--r-- | changelogs/unreleased/46286-fix-ingress-rbac-default-value.yml | 5 | ||||
| -rw-r--r-- | vendor/ingress/values.yaml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/46286-fix-ingress-rbac-default-value.yml b/changelogs/unreleased/46286-fix-ingress-rbac-default-value.yml new file mode 100644 index 00000000000..e9cd8977394 --- /dev/null +++ b/changelogs/unreleased/46286-fix-ingress-rbac-default-value.yml @@ -0,0 +1,5 @@ +--- +title: Disables RBAC on nginx-ingress +merge_request: 18947 +author: +type: fixed diff --git a/vendor/ingress/values.yaml b/vendor/ingress/values.yaml index a6b499953bf..d0c1673cefc 100644 --- a/vendor/ingress/values.yaml +++ b/vendor/ingress/values.yaml @@ -7,3 +7,8 @@ controller: podAnnotations: prometheus.io/scrape: "true" prometheus.io/port: "10254" + +rbac: + create: false + createRole: false + createClusterRole: false |