summaryrefslogtreecommitdiff
path: root/lib/gitlab/kubernetes/helm/api.rb
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2018-11-13 12:46:01 +0000
committerKamil TrzciƄski <ayufan@ayufan.eu>2018-11-13 12:46:01 +0000
commit14b3033a0d57ba377746896bcc83d1edb9da6f7a (patch)
tree5a599915abfe4567c42206918a51c81307259acd /lib/gitlab/kubernetes/helm/api.rb
parentf2ef5e2ee8ae46d324e4136dbc95ea40d1f21841 (diff)
downloadgitlab-ce-14b3033a0d57ba377746896bcc83d1edb9da6f7a.tar.gz
Show HTTP response code for Kubernetes errors
Diffstat (limited to 'lib/gitlab/kubernetes/helm/api.rb')
-rw-r--r--lib/gitlab/kubernetes/helm/api.rb18
1 files changed, 5 insertions, 13 deletions
diff --git a/lib/gitlab/kubernetes/helm/api.rb b/lib/gitlab/kubernetes/helm/api.rb
index e21bc531444..06841ec7b76 100644
--- a/lib/gitlab/kubernetes/helm/api.rb
+++ b/lib/gitlab/kubernetes/helm/api.rb
@@ -89,22 +89,14 @@ module Gitlab
end
def service_account_exists?(resource)
- resource_exists? do
- kubeclient.get_service_account(resource.metadata.name, resource.metadata.namespace)
- end
+ kubeclient.get_service_account(resource.metadata.name, resource.metadata.namespace)
+ rescue ::Kubeclient::ResourceNotFoundError
+ false
end
def cluster_role_binding_exists?(resource)
- resource_exists? do
- kubeclient.get_cluster_role_binding(resource.metadata.name)
- end
- end
-
- def resource_exists?
- yield
- rescue ::Kubeclient::HttpError => e
- raise e unless e.error_code == 404
-
+ kubeclient.get_cluster_role_binding(resource.metadata.name)
+ rescue ::Kubeclient::ResourceNotFoundError
false
end
end