From ab128cc125f9db0c3a1bd48845f90c3d61ef42c9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 6 Mar 2020 06:08:30 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- lib/gitlab/ci/pipeline/seed/deployment.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/gitlab/ci/pipeline') diff --git a/lib/gitlab/ci/pipeline/seed/deployment.rb b/lib/gitlab/ci/pipeline/seed/deployment.rb index 624189acc8a..69dfd6be8d5 100644 --- a/lib/gitlab/ci/pipeline/seed/deployment.rb +++ b/lib/gitlab/ci/pipeline/seed/deployment.rb @@ -23,12 +23,12 @@ module Gitlab # non-environment job. return unless deployment.valid? && deployment.environment.persisted? - if cluster_id = deployment.environment.deployment_platform&.cluster_id + if cluster = deployment.environment.deployment_platform&.cluster # double write cluster_id until 12.9: https://gitlab.com/gitlab-org/gitlab/issues/202628 - deployment.cluster_id = cluster_id + deployment.cluster_id = cluster.id deployment.deployment_cluster = ::DeploymentCluster.new( - cluster_id: cluster_id, - kubernetes_namespace: deployment.environment.deployment_namespace + cluster_id: cluster.id, + kubernetes_namespace: cluster.kubernetes_namespace_for(deployment.environment, deployable: job) ) end -- cgit v1.2.3