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

Merge branch '46286-fix-ingress-rbac-default-value' into 'master'
9f121081 · Kamil Trzciński · Mayra Cabrera · d8d10b29 · 9f121081 · 9f121081
Commit 9f121081 authored May 15, 2018 by Kamil Trzciński Committed by Mayra Cabrera May 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

46286-fix-ingress-rbac-default-value.yml ...elogs/unreleased/46286-fix-ingress-rbac-default-value.yml +5 -0

values.yaml vendor/ingress/values.yaml +5 -0

No files found.
--- a/changelogs/unreleased/46286-fix-ingress-rbac-default-value.yml
+++ b/changelogs/unreleased/46286-fix-ingress-rbac-default-value.yml
+---
+title: Disables RBAC on nginx-ingress
+merge_request: 18947
+author:
+type: fixed
--- 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