Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawel Chojnacki <pawel@chojnacki.ws>2018-02-26 21:57:11 +0300
committerPawel Chojnacki <pawel@chojnacki.ws>2018-02-26 21:57:11 +0300
commit2c090539f2dbdbc11c18598c7952a5de497047ea (patch)
tree14a60c7a5dc80dcc2f4175d647ac4ab35221711c /app/models/environment.rb
parent637c9558627655aaf08066371f0a5d50461578be (diff)
use deployment_platform DI in environment and revert changes to k8s cert verification policy
Diffstat (limited to 'app/models/environment.rb')
-rw-r--r--app/models/environment.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/models/environment.rb b/app/models/environment.rb
index 0c408257499..57960a7c3b3 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -220,6 +220,10 @@ class Environment < ActiveRecord::Base
self.environment_type || self.name
end
+ def deployment_platform
+ project.deployment_platform
+ end
+
def prometheus_adapter
@prometheus_adapter ||= if service_prometheus_adapter.can_query?
service_prometheus_adapter
@@ -233,9 +237,9 @@ class Environment < ActiveRecord::Base
end
def cluster_prometheus_adapter
- return unless project.deployment_platform.respond_to?(:cluster)
+ return unless deployment_platform.respond_to?(:cluster)
- cluster = project.deployment_platform.cluster
+ cluster = deployment_platform.cluster
return unless cluster.application_prometheus&.installed?
cluster.application_prometheus