diff --git a/test/unit/plugins/test_nginx_ingress.py b/test/unit/plugins/test_nginx_ingress.py index 112fb31c4..1497989ce 100644 --- a/test/unit/plugins/test_nginx_ingress.py +++ b/test/unit/plugins/test_nginx_ingress.py @@ -20,7 +20,7 @@ from kubemarine.core import errors, flow from kubemarine.plugins.manifest import Manifest, Identity from kubemarine.procedures import add_node, remove_node - +from distutils.version import LooseVersion class EnrichmentValidation(unittest.TestCase): def install(self): @@ -197,11 +197,12 @@ def test_webhook_resources_difference(self): manifest = self.enrich_yaml(cluster) webhook_resources = 0 - # Check if nginx-ingress-controller version is v1.9.5 or v1.9.6 before counting webhook resources + # Check if nginx-ingress-controller version is v1.9.5 or higher before counting webhook resources nginx_version = self.get_obj(manifest, "DaemonSet_ingress-nginx-controller")\ - ['spec']['template']['spec']['containers'][0]['image'] - if "v1.9.5" in nginx_version or "v1.9.6" in nginx_version or "v1.10.1" in nginx_version or "v1.11.1" in nginx_version: - expected_num_resources = 9 # Adjust expected number for v1.9.5 and v1.9.6 and v1.11.1 + ['spec']['template']['spec']['containers'][0]['image'].split(":")[-1] + + if LooseVersion(nginx_version) >= LooseVersion("v1.9.5"): + expected_num_resources = 9 # Adjust expected number for v1.9.5 and higher for key in self.all_obj_keys(manifest): if 'admission' in key: