Merge branch 'refactor_deployment_cluster' into 'master'

Refactor Deployment#cluster to #deployment_platform_cluster

See merge request gitlab-org/gitlab-ce!29961

1 files changed, 3 insertions, 6 deletions

diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index ee6e830d3ec..f0fa5974787 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -84,12 +84,9 @@ class Deployment < ApplicationRecord
     Commit.truncate_sha(sha)
   end
 
-  def cluster
-    platform = project.deployment_platform(environment: environment.name)
-
-    if platform.present? && platform.respond_to?(:cluster)
-      platform.cluster
-    end
+  # Deprecated - will be replaced by a persisted cluster_id
+  def deployment_platform_cluster
+    environment.deployment_platform&.cluster
   end
 
   def execute_hooks