summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-11-21 22:52:05 +0900
committerShinya Maeda <shinya@gitlab.com>2017-11-28 20:47:59 +0900
commitcff5eadd7cca3537db4566126714a376c8e21e9e (patch)
tree196804baf315de13a75b62fd00d1a38345b6fe03
parentcff4a50e53bb079c47790f21b147ea271f2c73f2 (diff)
downloadgitlab-ce-cff5eadd7cca3537db4566126714a376c8e21e9e.tar.gz
Add deployment platform selector
-rw-r--r--app/models/project.rb14
1 files changed, 12 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index e276bd2422d..1b201b13548 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -123,7 +123,7 @@ class Project < ActiveRecord::Base
has_one :bugzilla_service
has_one :gitlab_issue_tracker_service, inverse_of: :project
has_one :external_wiki_service
- has_one :kubernetes_service, inverse_of: :project
+ # has_one :kubernetes_service, inverse_of: :project
has_one :prometheus_service, inverse_of: :project
has_one :mock_ci_service
has_one :mock_deployment_service
@@ -907,7 +907,17 @@ class Project < ActiveRecord::Base
end
def deployment_service
- @deployment_service ||= deployment_services.reorder(nil).find_by(active: true)
+ deployment_platform
+ end
+
+ def kubernetes_service
+ deployment_platform
+ end
+
+ # TODO: This will be extended for multiple enviroment clusters
+ def deployment_platform
+ @deployment_platform ||= clusters.where(enabled: true).first&.platform_kubernetes
+ @deployment_platform ||= deployment_services.reorder(nil).find_by(active: true)
end
def monitoring_services