summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2018-11-12 12:31:56 +1300
committerThong Kuah <tkuah@gitlab.com>2018-11-12 12:31:56 +1300
commit97c49a148f29d86b12946616c77855a65a88d426 (patch)
treea600e810b0891126897bc2a1223305f892863e44
parent4d75e1da07d5462877c5534e4e95df74f9b1739f (diff)
downloadgitlab-ce-97c49a148f29d86b12946616c77855a65a88d426.tar.gz
Further improve some private methods
Now we can rescue directly, no need for yield !
-rw-r--r--lib/gitlab/kubernetes/helm/api.rb14
1 files changed, 4 insertions, 10 deletions
diff --git a/lib/gitlab/kubernetes/helm/api.rb b/lib/gitlab/kubernetes/helm/api.rb
index afaa0301e35..06841ec7b76 100644
--- a/lib/gitlab/kubernetes/helm/api.rb
+++ b/lib/gitlab/kubernetes/helm/api.rb
@@ -89,19 +89,13 @@ 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
+ kubeclient.get_cluster_role_binding(resource.metadata.name)
rescue ::Kubeclient::ResourceNotFoundError
false
end