Create v3_5 upgrade playbooks

2 files changed, 103 insertions, 42 deletions

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
index 29a59a0d3..0c94228c6 100644
--- 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
@@ -52,32 +52,64 @@ class LookupModule(LookupBase):
             # convert short_version to origin short_version
             short_version = re.sub('^3.', '1.', short_version)
 
-        if short_version in ['1.1', '1.2']:
-            predicates.append({'name': 'PodFitsHostPorts'})
-            predicates.append({'name': 'PodFitsResources'})
-
-        # applies to all known versions
-        predicates.append({'name': 'NoDiskConflict'})
-
-        # only 1.1 didn't include NoVolumeZoneConflict
-        if short_version != '1.1':
-            predicates.append({'name': 'NoVolumeZoneConflict'})
-
-        if short_version in ['1.1', '1.2']:
-            predicates.append({'name': 'MatchNodeSelector'})
-
-        if short_version != '1.1':
-            predicates.append({'name': 'MaxEBSVolumeCount'})
-            predicates.append({'name': 'MaxGCEPDVolumeCount'})
-
-        if short_version not in ['1.1', '1.2']:
-            predicates.append({'name': 'GeneralPredicates'})
-            predicates.append({'name': 'PodToleratesNodeTaints'})
-            predicates.append({'name': 'CheckNodeMemoryPressure'})
-
-        if short_version not in ['1.1', '1.2', '1.3']:
-            predicates.append({'name': 'CheckNodeDiskPressure'})
-            predicates.append({'name': 'MatchInterPodAffinity'})
+        # Predicates ordered according to OpenShift Origin source:
+        # origin/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go
+
+        if short_version == '1.1':
+            predicates.extend([
+                {'name': 'PodFitsHostPorts'},
+                {'name': 'PodFitsResources'},
+                {'name': 'NoDiskConflict'},
+                {'name': 'MatchNodeSelector'},
+            ])
+
+        if short_version == '1.2':
+            predicates.extend([
+                {'name': 'PodFitsHostPorts'},
+                {'name': 'PodFitsResources'},
+                {'name': 'NoDiskConflict'},
+                {'name': 'NoVolumeZoneConflict'},
+                {'name': 'MatchNodeSelector'},
+                {'name': 'MaxEBSVolumeCount'},
+                {'name': 'MaxGCEPDVolumeCount'}
+            ])
+
+        if short_version == '1.3':
+            predicates.extend([
+                {'name': 'NoDiskConflict'},
+                {'name': 'NoVolumeZoneConflict'},
+                {'name': 'MaxEBSVolumeCount'},
+                {'name': 'MaxGCEPDVolumeCount'},
+                {'name': 'GeneralPredicates'},
+                {'name': 'PodToleratesNodeTaints'},
+                {'name': 'CheckNodeMemoryPressure'}
+            ])
+
+        if short_version == '1.4':
+            predicates.extend([
+                {'name': 'NoDiskConflict'},
+                {'name': 'NoVolumeZoneConflict'},
+                {'name': 'MaxEBSVolumeCount'},
+                {'name': 'MaxGCEPDVolumeCount'},
+                {'name': 'GeneralPredicates'},
+                {'name': 'PodToleratesNodeTaints'},
+                {'name': 'CheckNodeMemoryPressure'},
+                {'name': 'CheckNodeDiskPressure'},
+                {'name': 'MatchInterPodAffinity'}
+            ])
+
+        if short_version in ['1.5', '1.6']:
+            predicates.extend([
+                {'name': 'NoVolumeZoneConflict'},
+                {'name': 'MaxEBSVolumeCount'},
+                {'name': 'MaxGCEPDVolumeCount'},
+                {'name': 'MatchInterPodAffinity'},
+                {'name': 'NoDiskConflict'},
+                {'name': 'GeneralPredicates'},
+                {'name': 'PodToleratesNodeTaints'},
+                {'name': 'CheckNodeMemoryPressure'},
+                {'name': 'CheckNodeDiskPressure'},
+            ])
 
         if regions_enabled:
             region_predicate = {
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
index 36022597f..95ace7923 100644
--- 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
@@ -11,11 +11,7 @@ class LookupModule(LookupBase):
     def run(self, terms, variables=None, zones_enabled=True, short_version=None,
             deployment_type=None, **kwargs):
 
-        priorities = [
-            {'name': 'LeastRequestedPriority', 'weight': 1},
-            {'name': 'BalancedResourceAllocation', 'weight': 1},
-            {'name': 'SelectorSpreadPriority', 'weight': 1}
-        ]
+        priorities = []
 
         if short_version is None or deployment_type is None:
             if 'openshift' not in variables:
@@ -57,18 +53,51 @@ class LookupModule(LookupBase):
             # convert short_version to origin short_version
             short_version = re.sub('^3.', '1.', short_version)
 
-        if short_version == '1.4':
-            priorities.append({'name': 'NodePreferAvoidPodsPriority', 'weight': 10000})
-
-        # only 1.1 didn't include NodeAffinityPriority
-        if short_version != '1.1':
-            priorities.append({'name': 'NodeAffinityPriority', 'weight': 1})
+        if short_version == '1.1':
+            priorities.extend([
+                {'name': 'LeastRequestedPriority', 'weight': 1},
+                {'name': 'BalancedResourceAllocation', 'weight': 1},
+                {'name': 'SelectorSpreadPriority', 'weight': 1}
+            ])
+
+        if short_version == '1.2':
+            priorities.extend([
+                {'name': 'LeastRequestedPriority', 'weight': 1},
+                {'name': 'BalancedResourceAllocation', 'weight': 1},
+                {'name': 'SelectorSpreadPriority', 'weight': 1},
+                {'name': 'NodeAffinityPriority', 'weight': 1}
+            ])
+
+        if short_version == '1.3':
+            priorities.extend([
+                {'name': 'LeastRequestedPriority', 'weight': 1},
+                {'name': 'BalancedResourceAllocation', 'weight': 1},
+                {'name': 'SelectorSpreadPriority', 'weight': 1},
+                {'name': 'NodeAffinityPriority', 'weight': 1},
+                {'name': 'TaintTolerationPriority', 'weight': 1}
+            ])
 
-        if short_version not in ['1.1', '1.2']:
-            priorities.append({'name': 'TaintTolerationPriority', 'weight': 1})
-
-        if short_version not in ['1.1', '1.2', '1.3']:
-            priorities.append({'name': 'InterPodAffinityPriority', 'weight': 1})
+        if short_version == '1.4':
+            priorities.extend([
+                {'name': 'LeastRequestedPriority', 'weight': 1},
+                {'name': 'BalancedResourceAllocation', 'weight': 1},
+                {'name': 'SelectorSpreadPriority', 'weight': 1},
+                {'name': 'NodePreferAvoidPodsPriority', 'weight': 10000},
+                {'name': 'NodeAffinityPriority', 'weight': 1},
+                {'name': 'TaintTolerationPriority', 'weight': 1},
+                {'name': 'InterPodAffinityPriority', 'weight': 1}
+            ])
+
+        if short_version in ['1.5', '1.6']:
+            priorities.extend([
+                {'name': 'SelectorSpreadPriority', 'weight': 1},
+                {'name': 'InterPodAffinityPriority', 'weight': 1},
+                {'name': 'LeastRequestedPriority', 'weight': 1},
+                {'name': 'BalancedResourceAllocation', 'weight': 1},
+                {'name': 'NodePreferAvoidPodsPriority', 'weight': 10000},
+                {'name': 'NodeAffinityPriority', 'weight': 1},
+                {'name': 'TaintTolerationPriority', 'weight': 1}
+            ])
 
         if zones_enabled:
             zone_priority = {