diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-09 18:06:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-09 18:06:58 +0000 |
commit | 41efffa17c67405ca5f5dac49d72be7872cee339 (patch) | |
tree | b5a369af722bb4d0f8ebfcb6abe2651864414a6d /vendor | |
parent | cc6b394a063eb77c90505e4adca2e2da2e29c3a2 (diff) | |
download | gitlab-ce-41efffa17c67405ca5f5dac49d72be7872cee339.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'vendor')
-rw-r--r-- | vendor/ingress/values.yaml | 5 | ||||
-rw-r--r-- | vendor/jupyter/values.yaml | 3 | ||||
-rw-r--r-- | vendor/prometheus/values.yaml | 3 | ||||
-rw-r--r-- | vendor/runner/values.yaml | 1 |
4 files changed, 0 insertions, 12 deletions
diff --git a/vendor/ingress/values.yaml b/vendor/ingress/values.yaml index d0c1673cefc..a6b499953bf 100644 --- a/vendor/ingress/values.yaml +++ b/vendor/ingress/values.yaml @@ -7,8 +7,3 @@ controller: podAnnotations: prometheus.io/scrape: "true" prometheus.io/port: "10254" - -rbac: - create: false - createRole: false - createClusterRole: false diff --git a/vendor/jupyter/values.yaml b/vendor/jupyter/values.yaml index c889814981e..879b7ea4271 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 60241c65202..be79a0c5380 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 e5f95152ac7..a34fa0caae4 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 |