From 0917e817838fb5ecb3993a18baafa2eadff9cf40 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Wed, 7 Mar 2018 18:14:25 +0800 Subject: [PATCH] Unify deployment_platform interface with EE --- app/models/concerns/deployment_platform.rb | 3 ++- app/models/environment.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/concerns/deployment_platform.rb b/app/models/concerns/deployment_platform.rb index 89d0474a596..faa94204e33 100644 --- a/app/models/concerns/deployment_platform.rb +++ b/app/models/concerns/deployment_platform.rb @@ -1,5 +1,6 @@ module DeploymentPlatform - def deployment_platform + # EE would override this and utilize the extra argument + def deployment_platform(environment: nil) @deployment_platform ||= find_cluster_platform_kubernetes || find_kubernetes_service_integration || diff --git a/app/models/environment.rb b/app/models/environment.rb index 24d4f1d8761..582a7818502 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -225,7 +225,7 @@ class Environment < ActiveRecord::Base end def deployment_platform - project.deployment_platform + project.deployment_platform(environment: self) end private -- GitLab