diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 12:08:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 12:08:59 +0000 |
| commit | 7351a484d79236b7e9d47c86f2fcc970b7ae10b0 (patch) | |
| tree | 651b5fca7ea0460e3ce7c687cfa9e3a3b37eefc8 /lib/gitlab/ci/pipeline/seed/deployment.rb | |
| parent | b4ded0ba7b4d2cdbed5b1f331cf2083a25ee4d7c (diff) | |
| download | gitlab-ce-7351a484d79236b7e9d47c86f2fcc970b7ae10b0.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/pipeline/seed/deployment.rb')
| -rw-r--r-- | lib/gitlab/ci/pipeline/seed/deployment.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/gitlab/ci/pipeline/seed/deployment.rb b/lib/gitlab/ci/pipeline/seed/deployment.rb index 8c90f03cb1d..cc63fb4c609 100644 --- a/lib/gitlab/ci/pipeline/seed/deployment.rb +++ b/lib/gitlab/ci/pipeline/seed/deployment.rb @@ -24,8 +24,14 @@ module Gitlab # non-environment job. return unless deployment.valid? && deployment.environment.persisted? - deployment.cluster_id = - deployment.environment.deployment_platform&.cluster_id + if cluster_id = deployment.environment.deployment_platform&.cluster_id + # double write cluster_id until 12.9: https://gitlab.com/gitlab-org/gitlab/issues/202628 + deployment.cluster_id = cluster_id + deployment.deployment_cluster = ::DeploymentCluster.new( + cluster_id: cluster_id, + kubernetes_namespace: deployment.environment.deployment_namespace + ) + end # Allocate IID for deployments. # This operation must be outside of transactions of pipeline creations. |