summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2019-07-01 04:25:52 +0000
committerLin Jen-Shin <godfat@godfat.org>2019-07-01 04:25:52 +0000
commitbc71d0b46164e8bcd4af78e5ce15261c8d796c52 (patch)
tree916092c65bcc99db69084b1bcf10dd072a300e34 /lib
parent5ad09f38cceb7ee648206fd28c155a360cb64d31 (diff)
parent04af6132b14e594aeddef2a6d0c171af667c9539 (diff)
downloadgitlab-ce-bc71d0b46164e8bcd4af78e5ce15261c8d796c52.tar.gz
Merge branch 'add-clusters-to-deployment' into 'master'
Add clusters association to deployment See merge request gitlab-org/gitlab-ce!29960
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb b/lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb
index 49c680605ea..e6e0aaab60b 100644
--- a/lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb
+++ b/lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb
@@ -20,7 +20,7 @@ module Gitlab
private
def deployment_cluster
- build.deployment&.deployment_platform_cluster
+ build.deployment&.cluster
end
def kubernetes_namespace