cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add exception handling when retrieving k8s client (#60726)

Browse source
This commit is contained in:
Will Thames 2019-09-13 00:02:52 +10:00 • committed by John R Barker
parent 7e91998049
commit c170ab5e31
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/module_utils/k8s/raw.py
View file

@ -35,6 +35,7 @@ from ansible.module_utils.common.dict_transformations import dict_merge
try:
import yaml
from openshift.dynamic.exceptions import DynamicApiError, NotFoundError, ConflictError, ForbiddenError, KubernetesValidateMissing
import urllib3
except ImportError:
# Exceptions handled in common
pass
@ -163,7 +164,11 @@ class KubernetesRawModule(KubernetesAnsibleModule):
def execute_module(self):
changed = False
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 = []
for definition in self.resource_definitions: