Merge pull request #7089 from sdodson/fix-predicates-39

Remove NoVolumeNodeConflict from 3.9+
openshift · Feb 23, 2018 · b5e83a3 · b5e83a3
2 parents 5b93d79 + df793e9
commit b5e83a3
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 262 deletions.
diff --git a/roles/lib_utils/lookup_plugins/openshift_master_facts_default_predicates.py b/roles/lib_utils/lookup_plugins/openshift_master_facts_default_predicates.py
@@ -114,7 +114,7 @@ def run(self, terms, variables=None, regions_enabled=True, short_version=None,
                 {'name': 'CheckNodeDiskPressure'},
             ])
 
-        if short_version in ['3.7', '3.8', '3.9', '3.10']:
+        if short_version in ['3.7', '3.8']:
             predicates.extend([
                 {'name': 'NoVolumeZoneConflict'},
                 {'name': 'MaxEBSVolumeCount'},
@@ -129,6 +129,21 @@ def run(self, terms, variables=None, regions_enabled=True, short_version=None,
                 {'name': 'NoVolumeNodeConflict'},
             ])
 
+        if short_version in ['3.9', '3.10']:
+            predicates.extend([
+                {'name': 'NoVolumeZoneConflict'},
+                {'name': 'MaxEBSVolumeCount'},
+                {'name': 'MaxGCEPDVolumeCount'},
+                {'name': 'MaxAzureDiskVolumeCount'},
+                {'name': 'MatchInterPodAffinity'},
+                {'name': 'NoDiskConflict'},
+                {'name': 'GeneralPredicates'},
+                {'name': 'PodToleratesNodeTaints'},
+                {'name': 'CheckNodeMemoryPressure'},
+                {'name': 'CheckNodeDiskPressure'},
+                {'name': 'CheckVolumeBinding'},
+            ])
+
         if regions_enabled:
             region_predicate = {
                 'name': 'Region',

diff --git a/roles/lib_utils/test/openshift_master_facts_default_predicates_tests.py b/roles/lib_utils/test/openshift_master_facts_default_predicates_tests.py
@@ -71,7 +71,23 @@
     {'name': 'NoVolumeNodeConflict'},
 ]
 
-DEFAULT_PREDICATES_3_10 = DEFAULT_PREDICATES_3_9 = DEFAULT_PREDICATES_3_8 = DEFAULT_PREDICATES_3_7
+DEFAULT_PREDICATES_3_8 = DEFAULT_PREDICATES_3_7
+
+DEFAULT_PREDICATES_3_9 = [
+    {'name': 'NoVolumeZoneConflict'},
+    {'name': 'MaxEBSVolumeCount'},
+    {'name': 'MaxGCEPDVolumeCount'},
+    {'name': 'MaxAzureDiskVolumeCount'},
+    {'name': 'MatchInterPodAffinity'},
+    {'name': 'NoDiskConflict'},
+    {'name': 'GeneralPredicates'},
+    {'name': 'PodToleratesNodeTaints'},
+    {'name': 'CheckNodeMemoryPressure'},
+    {'name': 'CheckNodeDiskPressure'},
+    {'name': 'CheckVolumeBinding'},
+]
+
+DEFAULT_PREDICATES_3_10 = DEFAULT_PREDICATES_3_9
 
 REGION_PREDICATE = {
     'name': 'Region',

diff --git a/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py b/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py
diff --git a/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_priorities.py b/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_priorities.py