Add exception handling when retrieving k8s client (#60726)

pull/62209/head
Will Thames 5 years ago committed by John R Barker
parent 7e91998049
commit c170ab5e31

@ -35,6 +35,7 @@ from ansible.module_utils.common.dict_transformations import dict_merge
try: try:
import yaml import yaml
from openshift.dynamic.exceptions import DynamicApiError, NotFoundError, ConflictError, ForbiddenError, KubernetesValidateMissing from openshift.dynamic.exceptions import DynamicApiError, NotFoundError, ConflictError, ForbiddenError, KubernetesValidateMissing
import urllib3
except ImportError: except ImportError:
# Exceptions handled in common # Exceptions handled in common
pass pass
@ -163,7 +164,11 @@ class KubernetesRawModule(KubernetesAnsibleModule):
def execute_module(self): def execute_module(self):
changed = False changed = False
results = [] results = []
self.client = self.get_api_client() try:
self.client = self.get_api_client()
# Hopefully the kubernetes client will provide its own exception class one day
except (urllib3.exceptions.RequestError) as e:
self.fail_json(msg="Couldn't connect to Kubernetes: %s" % str(e))
flattened_definitions = [] flattened_definitions = []
for definition in self.resource_definitions: for definition in self.resource_definitions:

Loading…
Cancel
Save