diff options
| author | James Fargher <proglottis@gmail.com> | 2019-09-02 13:42:36 +1200 |
|---|---|---|
| committer | James Fargher <proglottis@gmail.com> | 2019-09-05 09:46:51 +1200 |
| commit | bc04a1dcf4b71be46ac24ec6a449374d1db2320a (patch) | |
| tree | a520532f5ff7dee7b04b3160ef942275dbbabd4b /app/models/clusters | |
| parent | 632b4075aa724a51e5c1405d93b12c063d439c4c (diff) | |
| download | gitlab-ce-bc04a1dcf4b71be46ac24ec6a449374d1db2320a.tar.gz | |
Allow group install of JupyterHubgroup_level_jupyterhub
Removes limitations on cluster types that can install JupyterHub
Diffstat (limited to 'app/models/clusters')
| -rw-r--r-- | app/models/clusters/applications/jupyter.rb | 7 | ||||
| -rw-r--r-- | app/models/clusters/cluster.rb | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/app/models/clusters/applications/jupyter.rb b/app/models/clusters/applications/jupyter.rb index fb74d96efe3..ec65482a846 100644 --- a/app/models/clusters/applications/jupyter.rb +++ b/app/models/clusters/applications/jupyter.rb @@ -85,7 +85,8 @@ module Clusters "clientId" => oauth_application.uid, "clientSecret" => oauth_application.secret, "callbackUrl" => callback_url, - "gitlabProjectIdWhitelist" => [project_id] + "gitlabProjectIdWhitelist" => cluster.projects.ids, + "gitlabGroupWhitelist" => cluster.groups.map(&:to_param) } }, "singleuser" => { @@ -101,10 +102,6 @@ module Clusters @crypto_key ||= SecureRandom.hex(32) end - def project_id - cluster&.project&.id - end - def gitlab_url Gitlab.config.gitlab.url end diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb index 444e1a82c97..ef1af1fc8bc 100644 --- a/app/models/clusters/cluster.rb +++ b/app/models/clusters/cluster.rb @@ -10,15 +10,15 @@ module Clusters self.table_name = 'clusters' PROJECT_ONLY_APPLICATIONS = { - Applications::Jupyter.application_name => Applications::Jupyter, Applications::Knative.application_name => Applications::Knative }.freeze APPLICATIONS = { Applications::Helm.application_name => Applications::Helm, Applications::Ingress.application_name => Applications::Ingress, Applications::CertManager.application_name => Applications::CertManager, + Applications::Prometheus.application_name => Applications::Prometheus, Applications::Runner.application_name => Applications::Runner, - Applications::Prometheus.application_name => Applications::Prometheus + Applications::Jupyter.application_name => Applications::Jupyter }.merge(PROJECT_ONLY_APPLICATIONS).freeze DEFAULT_ENVIRONMENT = '*' KUBE_INGRESS_BASE_DOMAIN = 'KUBE_INGRESS_BASE_DOMAIN' |