From 1390346a3129cc509695690e53b16f3bbd9d0ca3 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Mon, 29 Apr 2019 10:30:29 +0000 Subject: [PATCH] Merge branch '60821-deployment-jobs-broken-as-of-11-10-0' into 'master' Resolve "Deployment jobs broken as of 11.10.0" Closes #60821 See merge request gitlab-org/gitlab-ce!27687 (cherry picked from commit 6885419a48c39ab9f38aea13ec1900b10bce7d80) 825d7596 Fix deployments for Kubernetes service templates --- app/models/deployment.rb | 6 +++++- .../60821-deployment-jobs-broken-as-of-11-10-0.yml | 5 +++++ spec/models/deployment_spec.rb | 6 ++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/60821-deployment-jobs-broken-as-of-11-10-0.yml diff --git a/app/models/deployment.rb b/app/models/deployment.rb index d847a0a11e4..332cd87c97a 100644 --- a/app/models/deployment.rb +++ b/app/models/deployment.rb @@ -79,7 +79,11 @@ class Deployment < ApplicationRecord end 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 def last? diff --git a/changelogs/unreleased/60821-deployment-jobs-broken-as-of-11-10-0.yml b/changelogs/unreleased/60821-deployment-jobs-broken-as-of-11-10-0.yml new file mode 100644 index 00000000000..88584352d42 --- /dev/null +++ b/changelogs/unreleased/60821-deployment-jobs-broken-as-of-11-10-0.yml @@ -0,0 +1,5 @@ +--- +title: Fix Kubernetes service template deployment jobs broken as of 11.10.0 +merge_request: 27687 +author: +type: fixed diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb index d9170d5fa07..be0cc58b35a 100644 --- a/spec/models/deployment_spec.rb +++ b/spec/models/deployment_spec.rb @@ -379,6 +379,12 @@ describe Deployment do it { is_expected.to be_nil } 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 let!(:cluster) { create(:cluster, projects: [project]) } let!(:platform) { create(:cluster_platform_kubernetes, cluster: cluster) } -- GitLab