diff --git a/deployment_report/model/utils/ingress_util.py b/deployment_report/model/utils/ingress_util.py index 41b913b..03c9b4a 100644 --- a/deployment_report/model/utils/ingress_util.py +++ b/deployment_report/model/utils/ingress_util.py @@ -82,6 +82,7 @@ def ignorable_for_controller_if_unavailable(ingress_controller: Text, resource_t #################### elif ingress_controller == SupportedIngress.Controllers.NGINX and ( resource_type == ResourceTypeValues.CONTOUR_HTTP_PROXIES or + resource_type == ResourceTypeValues.K8S_EXTENSIONS_INGRESSES or resource_type == ResourceTypeValues.OPENSHIFT_ROUTES or resource_type == ResourceTypeValues.ISTIO_VIRTUAL_SERVICES ): diff --git a/deployment_report/model/utils/test/test_ingress_utils.py b/deployment_report/model/utils/test/test_ingress_utils.py index 897213a..ee67159 100644 --- a/deployment_report/model/utils/test/test_ingress_utils.py +++ b/deployment_report/model/utils/test/test_ingress_utils.py @@ -233,6 +233,10 @@ def test_ignorable_for_controller_if_unavailable_nginx(): assert ingress_util.ignorable_for_controller_if_unavailable( ingress_controller=SupportedIngress.Controllers.NGINX, resource_type=ResourceTypeValues.CONTOUR_HTTP_PROXIES) + # Ingress (v1beta1 - deprecated) + assert ingress_util.ignorable_for_controller_if_unavailable( + ingress_controller=SupportedIngress.Controllers.NGINX, + resource_type=ResourceTypeValues.K8S_EXTENSIONS_INGRESSES) # Route assert ingress_util.ignorable_for_controller_if_unavailable( ingress_controller=SupportedIngress.Controllers.NGINX, @@ -248,9 +252,6 @@ def test_ignorable_for_controller_if_unavailable_nginx(): ingress_controller=SupportedIngress.Controllers.NGINX, resource_type=ResourceTypeValues.K8S_CORE_PODS) # Ingress - assert not ingress_util.ignorable_for_controller_if_unavailable( - ingress_controller=SupportedIngress.Controllers.NGINX, - resource_type=ResourceTypeValues.K8S_EXTENSIONS_INGRESSES) assert not ingress_util.ignorable_for_controller_if_unavailable( ingress_controller=SupportedIngress.Controllers.NGINX, resource_type=ResourceTypeValues.K8S_NETWORKING_INGRESSES)