internet/community.okd
3
0
Fork 0
mirror of https://github.com/openshift/community.okd.git synced 2026-05-06 13:12:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update for Ansible 2.15 sanity tests (#173)

Browse Source
This commit is contained in:
Mike Graves
2022-09-22 09:38:20 -04:00
committed by GitHub
parent ed9fb196f9
commit 1691951788
12 changed files with 128 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/modules/openshift_adm_migrate_template_instances.py
View File

@@ -241,6 +241,8 @@ try:
from kubernetes.dynamic.exceptions import DynamicApiError
HAS_KUBERNETES_COLLECTION = True
k8s_collection_import_exception = None
K8S_COLLECTION_ERROR = None
except ImportError as e:
HAS_KUBERNETES_COLLECTION = False
k8s_collection_import_exception = e

4
plugins/modules/openshift_route.py
View File

@@ -321,6 +321,8 @@ try:
AUTH_ARG_SPEC, WAIT_ARG_SPEC, COMMON_ARG_SPEC
)
HAS_KUBERNETES_COLLECTION = True
k8s_collection_import_exception = None
K8S_COLLECTION_ERROR = None
except ImportError as e:
HAS_KUBERNETES_COLLECTION = False
k8s_collection_import_exception = e
@@ -542,7 +544,7 @@ class OpenShiftRoute(K8sAnsibleMixin):
def wait_predicate(route):
if not(route.status and route.status.ingress):
if not (route.status and route.status.ingress):
return False
for ingress in route.status.ingress:
match = [x for x in ingress.conditions if x.type == 'Admitted']