diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-13 12:12:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-13 12:12:02 +0300 |
| commit | ce79b3dd66d0e9616d547f90a93cce0b709407a3 (patch) | |
| tree | d862546e33d6551e47d25ce70aa9e5167e98dfeb /app/services/deployments | |
| parent | 95ce32c508b9d6c9bda443f0762b92ec71074777 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/deployments')
| -rw-r--r-- | app/services/deployments/create_for_job_service.rb | 2 | ||||
| -rw-r--r-- | app/services/deployments/create_service.rb | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/app/services/deployments/create_for_job_service.rb b/app/services/deployments/create_for_job_service.rb index e230515ce27..fb07efe8694 100644 --- a/app/services/deployments/create_for_job_service.rb +++ b/app/services/deployments/create_for_job_service.rb @@ -38,8 +38,6 @@ module Deployments return unless deployment.valid? && deployment.environment.persisted? if cluster = deployment.environment.deployment_platform&.cluster # rubocop: disable Lint/AssignmentInCondition - # 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: cluster.kubernetes_namespace_for(deployment.environment, deployable: job) diff --git a/app/services/deployments/create_service.rb b/app/services/deployments/create_service.rb index ebf2b077bca..8ef9982f41b 100644 --- a/app/services/deployments/create_service.rb +++ b/app/services/deployments/create_service.rb @@ -28,7 +28,6 @@ module Deployments # We use explicit parameters here so we never by accident allow parameters # to be set that one should not be able to set (e.g. the row ID). { - cluster_id: environment.deployment_platform&.cluster_id, project_id: environment.project_id, environment_id: environment.id, ref: params[:ref], |