Automatic merge of gitlab-org/gitlab-ce master

app/controllers/projects/environments_controller.rb

@@ -135,13 +135,13 @@ class Projects::EnvironmentsController < Projects::ApplicationController
   end
 
   def metrics
+    respond_to do |format|
+      format.html
+      format.json do
         # Currently, this acts as a hint to load the metrics details into the cache
         # if they aren't there already
         @metrics = environment.metrics || {}
 
-    respond_to do |format|
-      format.html
-      format.json do
         render json: @metrics, status: @metrics.any? ? :ok : :no_content
       end
     end

app/models/deployment.rb

@@ -85,7 +85,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 execute_hooks

changelogs/unreleased/60821-deployment-jobs-broken-as-of-11-10-0.yml

+---
+title: Fix Kubernetes service template deployment jobs broken as of 11.10.0
+merge_request: 27687
+author:
+type: fixed

qa/qa/vendor/github/page/login.rb

@@ -12,12 +12,10 @@ module QA
             fill_in 'password', with: QA::Runtime::Env.github_password
             click_on 'Sign in'
 
-            unless has_no_text?("Authorize GitLab-OAuth")
             click_on 'Authorize gitlab-qa' if has_button?('Authorize gitlab-qa')
           end
         end
       end
     end
   end
-  end
 end

spec/controllers/projects/environments_controller_spec.rb

@@ -342,11 +342,9 @@ describe Projects::EnvironmentsController do
     end
 
     context 'when environment has no metrics' do
-      before do
-        expect(environment).to receive(:metrics).and_return(nil)
-      end
-
       it 'returns a metrics page' do
+        expect(environment).not_to receive(:metrics)
+
         get :metrics, params: environment_params
 
         expect(response).to be_ok
@@ -354,6 +352,8 @@ describe Projects::EnvironmentsController do
 
       context 'when requesting metrics as JSON' do
         it 'returns a metrics JSON document' do
+          expect(environment).to receive(:metrics).and_return(nil)
+
           get :metrics, params: environment_params(format: :json)
 
           expect(response).to have_gitlab_http_status(204)

spec/models/deployment_spec.rb

@@ -400,6 +400,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) }