Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

2 files changed, 8 insertions, 3 deletions

diff --git a/app/services/clusters/cleanup/project_namespace_service.rb b/app/services/clusters/cleanup/project_namespace_service.rb
index 16254041306..0173f93f625 100644
--- a/app/services/clusters/cleanup/project_namespace_service.rb
+++ b/app/services/clusters/cleanup/project_namespace_service.rb
@@ -35,9 +35,11 @@ module Clusters
       end
 
       def kubeclient_delete_namespace(kubernetes_namespace)
-        cluster.kubeclient.delete_namespace(kubernetes_namespace.namespace)
+        cluster.kubeclient&.delete_namespace(kubernetes_namespace.namespace)
       rescue Kubeclient::ResourceNotFoundError
-        # no-op: nothing to delete
+        # The resources have already been deleted, possibly on a previous attempt that timed out
+      rescue Gitlab::UrlBlocker::BlockedUrlError
+        # User gave an invalid cluster from the start, or deleted the endpoint before this job ran
       end
     end
   end
diff --git a/app/services/clusters/cleanup/service_account_service.rb b/app/services/clusters/cleanup/service_account_service.rb
index baac9e4a9e7..53f968cd409 100644
--- a/app/services/clusters/cleanup/service_account_service.rb
+++ b/app/services/clusters/cleanup/service_account_service.rb
@@ -16,11 +16,14 @@ module Clusters
       def delete_gitlab_service_account
         log_event(:deleting_gitlab_service_account)
 
-        cluster.kubeclient.delete_service_account(
+        cluster.kubeclient&.delete_service_account(
           ::Clusters::Kubernetes::GITLAB_SERVICE_ACCOUNT_NAME,
           ::Clusters::Kubernetes::GITLAB_SERVICE_ACCOUNT_NAMESPACE
         )
       rescue Kubeclient::ResourceNotFoundError
+        # The resources have already been deleted, possibly on a previous attempt that timed out
+      rescue Gitlab::UrlBlocker::BlockedUrlError
+        # User gave an invalid cluster from the start, or deleted the endpoint before this job ran
       end
     end
   end