diff options
author | Amit Rathi <amit@hypertrack.io> | 2018-11-14 10:14:50 +0530 |
---|---|---|
committer | Amit Rathi <amit@hypertrack.io> | 2018-11-14 10:14:50 +0530 |
commit | 5c275490ec8728deec3b6747c742e985656befc8 (patch) | |
tree | b621b70e3a23fa39766c295b2222c87a5e84fc21 /lib/gitlab/kubernetes | |
parent | f6b20cc23866ba20fd97a0f78457c456a36d9fee (diff) | |
parent | 078fab665bee3cf283053fe03193b6a73ff7d427 (diff) | |
download | gitlab-ce-5c275490ec8728deec3b6747c742e985656befc8.tar.gz |
Merge branch 'master' into certmanager-temp
Diffstat (limited to 'lib/gitlab/kubernetes')
-rw-r--r-- | lib/gitlab/kubernetes/helm/api.rb | 18 | ||||
-rw-r--r-- | lib/gitlab/kubernetes/namespace.rb | 4 |
2 files changed, 6 insertions, 16 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 diff --git a/lib/gitlab/kubernetes/namespace.rb b/lib/gitlab/kubernetes/namespace.rb index e6ff6160ab9..783c8a24741 100644 --- a/lib/gitlab/kubernetes/namespace.rb +++ b/lib/gitlab/kubernetes/namespace.rb @@ -10,9 +10,7 @@ module Gitlab def exists? @client.get_namespace(name) - rescue ::Kubeclient::HttpError => ke - raise ke unless ke.error_code == 404 - + rescue ::Kubeclient::ResourceNotFoundError false end |