diff options
| author | Tiger Watson <twatson@gitlab.com> | 2019-03-26 12:59:48 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-03-26 12:59:48 +0300 |
| commit | 76d281881a945518fe4565e1dc71f6a3bc28c575 (patch) | |
| tree | 3bece712d331a02e52ac9735fb4f85ac70b08ef5 /app/services/clusters | |
| parent | c77a1978cdadc9ae3fcfe7b1b31e535af80e61c9 (diff) | |
Allow runners to be installed on group clusters
A runner installed on a cluster will now use the
cluster's `cluster_type` as its `runner_type`.
Diffstat (limited to 'app/services/clusters')
| -rw-r--r-- | app/services/clusters/applications/create_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/clusters/applications/create_service.rb b/app/services/clusters/applications/create_service.rb index bd7c31bb981..c6f729aaa8a 100644 --- a/app/services/clusters/applications/create_service.rb +++ b/app/services/clusters/applications/create_service.rb @@ -13,7 +13,8 @@ module Clusters { "helm" => -> (cluster) { cluster.application_helm || cluster.build_application_helm }, "ingress" => -> (cluster) { cluster.application_ingress || cluster.build_application_ingress }, - "cert_manager" => -> (cluster) { cluster.application_cert_manager || cluster.build_application_cert_manager } + "cert_manager" => -> (cluster) { cluster.application_cert_manager || cluster.build_application_cert_manager }, + "runner" => -> (cluster) { cluster.application_runner || cluster.build_application_runner } }.tap do |hash| hash.merge!(project_builders) if cluster.project_type? end @@ -24,7 +25,6 @@ module Clusters def project_builders { "prometheus" => -> (cluster) { cluster.application_prometheus || cluster.build_application_prometheus }, - "runner" => -> (cluster) { cluster.application_runner || cluster.build_application_runner }, "jupyter" => -> (cluster) { cluster.application_jupyter || cluster.build_application_jupyter }, "knative" => -> (cluster) { cluster.application_knative || cluster.build_application_knative } } |