From c5300cc180e54b746302db28f47c36e7f4de9f56 Mon Sep 17 00:00:00 2001
From: Thong Kuah <tkuah@gitlab.com>
Date: Wed, 9 Oct 2019 19:43:31 +1300
Subject: [PATCH] Use upstream rbac.create value
In any case, Gitlab::Kubernetes::Helm::InstallCommand requires rbac or
not to be specified which will set the approriate rbac.create value on
installation or upgrade of apps
---
spec/models/clusters/applications/jupyter_spec.rb | 2 --
vendor/ingress/values.yaml | 3 ---
vendor/jupyter/values.yaml | 3 ---
vendor/prometheus/values.yaml | 3 ---
vendor/runner/values.yaml | 1 -
5 files changed, 12 deletions(-)
diff --git a/spec/models/clusters/applications/jupyter_spec.rb b/spec/models/clusters/applications/jupyter_spec.rb
index e1eee01456789..0ec9333d6a771 100644
--- a/spec/models/clusters/applications/jupyter_spec.rb
+++ b/spec/models/clusters/applications/jupyter_spec.rb
@@ -91,7 +91,6 @@
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 @@
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')
diff --git a/vendor/ingress/values.yaml b/vendor/ingress/values.yaml
index fd1f311856bdd..a6b499953bf82 100644
--- a/vendor/ingress/values.yaml
+++ b/vendor/ingress/values.yaml
@@ -7,6 +7,3 @@ controller:
podAnnotations:
prometheus.io/scrape: "true"
prometheus.io/port: "10254"
-
-rbac:
- create: false
diff --git a/vendor/jupyter/values.yaml b/vendor/jupyter/values.yaml
index c889814981edd..879b7ea4271f8 100644
--- a/vendor/jupyter/values.yaml
+++ b/vendor/jupyter/values.yaml
@@ -1,6 +1,3 @@
-rbac:
- enabled: false
-
hub:
extraEnv:
JUPYTER_ENABLE_LAB: 1
diff --git a/vendor/prometheus/values.yaml b/vendor/prometheus/values.yaml
index 60241c6520241..be79a0c53800e 100644
--- a/vendor/prometheus/values.yaml
+++ b/vendor/prometheus/values.yaml
@@ -12,9 +12,6 @@ nodeExporter:
pushgateway:
enabled: false
-rbac:
- create: false
-
server:
fullnameOverride: "prometheus-prometheus-server"
image:
diff --git a/vendor/runner/values.yaml b/vendor/runner/values.yaml
index e5f95152ac732..a34fa0caae4da 100644
--- a/vendor/runner/values.yaml
+++ b/vendor/runner/values.yaml
@@ -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
--
GitLab