diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 11:31:16 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 11:31:16 +0000 |
| commit | 905c1110b08f93a19661cf42a276c7ea90d0a0ff (patch) | |
| tree | 756d138db422392c00471ab06acdff92c5a9b69c /vendor | |
| parent | 50d93f8d1686950fc58dda4823c4835fd0d8c14b (diff) | |
| download | gitlab-ce-905c1110b08f93a19661cf42a276c7ea90d0a0ff.tar.gz | |
Add latest changes from gitlab-org/gitlab@12-4-stable-ee
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/ingress/values.yaml | 6 | ||||
| -rw-r--r-- | vendor/jupyter/values.yaml | 3 | ||||
| -rw-r--r-- | vendor/licenses.csv | 1 | ||||
| -rw-r--r-- | vendor/prometheus/values.yaml | 3 | ||||
| -rw-r--r-- | vendor/runner/values.yaml | 1 |
5 files changed, 0 insertions, 14 deletions
diff --git a/vendor/ingress/values.yaml b/vendor/ingress/values.yaml index d0c1673cefc..0baaccedc4e 100644 --- a/vendor/ingress/values.yaml +++ b/vendor/ingress/values.yaml @@ -1,14 +1,8 @@ controller: image: - tag: "0.10.2" repository: "quay.io/kubernetes-ingress-controller/nginx-ingress-controller" stats: enabled: true 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/licenses.csv b/vendor/licenses.csv index 41dd9eb5256..c8b305d767d 100644 --- a/vendor/licenses.csv +++ b/vendor/licenses.csv @@ -1131,7 +1131,6 @@ vue-apollo,3.0.0-beta.25,ISC vue-functional-data-merge,2.0.6,MIT vue-hot-reload-api,2.3.0,MIT vue-loader,15.4.2,MIT -vue-resource,1.5.0,MIT vue-router,3.0.1,MIT vue-style-loader,4.1.0,MIT vue-template-compiler,2.5.17,MIT 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 |