Merge branch 'ce-to-ee-2018-11-11' into 'master'

CE upstream - 2018-11-11 17:21 UTC

See merge request gitlab-org/gitlab-ee!8392

app/services/clusters/gcp/kubernetes/create_or_update_namespace_service.rb

@@ -16,8 +16,6 @@ module Clusters
           configure_kubernetes_token
 
           kubernetes_namespace.save!
-        rescue ::Kubeclient::HttpError => err
-          raise err unless err.error_code = 404
         end
 
         private

app/workers/cluster_platform_configure_worker.rb

@@ -17,6 +17,6 @@ class ClusterPlatformConfigureWorker
     end
 
   rescue ::Kubeclient::HttpError => err
-    Rails.logger.error "Failed to create/update Kubernetes Namespace. id: #{kubernetes_namespace.id} message: #{err.message}"
+    Rails.logger.error "Failed to create/update Kubernetes namespace for cluster_id: #{cluster_id} with error: #{err.message}"
   end
 end

changelogs/unreleased/fix-error-handling-bugs-in-kubernetes-integration.yml

+---
+title: Fix error handling bugs in kubernetes integration
+merge_request: 22922
+author:
+type: fixed

spec/workers/cluster_platform_configure_worker_spec.rb

@@ -30,4 +30,18 @@ describe ClusterPlatformConfigureWorker, '#execute' do
       described_class.new.perform(123)
     end
   end
+
+  context 'when kubeclient raises error' do
+    let(:cluster) { create(:cluster, :project) }
+
+    it 'rescues and logs the error' do
+      allow_any_instance_of(Clusters::Gcp::Kubernetes::CreateOrUpdateNamespaceService).to receive(:execute).and_raise(::Kubeclient::HttpError.new(500, 'something baaaad happened', ''))
+
+      expect(Rails.logger)
+        .to receive(:error)
+        .with("Failed to create/update Kubernetes namespace for cluster_id: #{cluster.id} with error: something baaaad happened")
+
+      described_class.new.perform(cluster.id)
+    end
+  end
 end