Commit 307af045 authored by Michael Kozono's avatar Michael Kozono

Merge branch 'rbac_gitlab_managed_apps' into 'master'

GitLab-managed apps: use upstream values for rbac.create

See merge request gitlab-org/gitlab!18312
parents 169d4e31 c5300cc1
......@@ -91,7 +91,6 @@ describe Clusters::Applications::Jupyter do
it 'includes valid values' do
expect(values).to include('ingress')
expect(values).to include('hub')
expect(values).to include('rbac')
expect(values).to include('proxy')
expect(values).to include('auth')
expect(values).to include('singleuser')
......@@ -111,7 +110,6 @@ describe Clusters::Applications::Jupyter do
it 'includes valid values' do
expect(values).to include('ingress')
expect(values).to include('hub')
expect(values).to include('rbac')
expect(values).to include('proxy')
expect(values).to include('auth')
expect(values).to include('singleuser')
......
......@@ -7,8 +7,3 @@ controller:
podAnnotations:
prometheus.io/scrape: "true"
prometheus.io/port: "10254"
rbac:
create: false
createRole: false
createClusterRole: false
rbac:
enabled: false
hub:
extraEnv:
JUPYTER_ENABLE_LAB: 1
......
......@@ -12,9 +12,6 @@ nodeExporter:
pushgateway:
enabled: false
rbac:
create: false
server:
fullnameOverride: "prometheus-prometheus-server"
image:
......
......@@ -11,7 +11,6 @@ checkInterval: 3
## For RBAC support
rbac:
create: false
clusterWideAccess: false
## Configuration for the Pods that that the runner launches for each new job
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment