Merge branch 'fix-error-handling-bugs-in-kubernetes-integration' into 'master'

Fix error handling bugs in kubernetes integration

See merge request gitlab-org/gitlab-ce!22922

2 files changed, 1 insertions, 3 deletions

diff --git a/app/services/clusters/gcp/kubernetes/create_or_update_namespace_service.rb b/app/services/clusters/gcp/kubernetes/create_or_update_namespace_service.rb
index a888fab2789..2b607681082 100644
--- a/app/services/clusters/gcp/kubernetes/create_or_update_namespace_service.rb
+++ b/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
diff --git a/app/workers/cluster_platform_configure_worker.rb b/app/workers/cluster_platform_configure_worker.rb
index 68e8335a09d..8f3689f0166 100644
--- a/app/workers/cluster_platform_configure_worker.rb
+++ b/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