Fix deployments for Kubernetes service templates
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27687
This commit is contained in:
parent
6246979a86
commit
825d759634
|
@ -85,7 +85,11 @@ class Deployment < ApplicationRecord
|
||||||
end
|
end
|
||||||
|
|
||||||
def cluster
|
def cluster
|
||||||
project.deployment_platform(environment: environment.name)&.cluster
|
platform = project.deployment_platform(environment: environment.name)
|
||||||
|
|
||||||
|
if platform.present? && platform.respond_to?(:cluster)
|
||||||
|
platform.cluster
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def execute_hooks
|
def execute_hooks
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Fix Kubernetes service template deployment jobs broken as of 11.10.0
|
||||||
|
merge_request: 27687
|
||||||
|
author:
|
||||||
|
type: fixed
|
|
@ -400,6 +400,12 @@ describe Deployment do
|
||||||
it { is_expected.to be_nil }
|
it { is_expected.to be_nil }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'project uses the kubernetes service for deployments' do
|
||||||
|
let!(:service) { create(:kubernetes_service, project: project) }
|
||||||
|
|
||||||
|
it { is_expected.to be_nil }
|
||||||
|
end
|
||||||
|
|
||||||
context 'project has a deployment platform' do
|
context 'project has a deployment platform' do
|
||||||
let!(:cluster) { create(:cluster, projects: [project]) }
|
let!(:cluster) { create(:cluster, projects: [project]) }
|
||||||
let!(:platform) { create(:cluster_platform_kubernetes, cluster: cluster) }
|
let!(:platform) { create(:cluster_platform_kubernetes, cluster: cluster) }
|
||||||
|
|
Loading…
Reference in New Issue