From d83e13a674d006e70d34ee15478b582654a923ef Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 8 Feb 2017 13:42:48 +0100 Subject: master: latest use same priorities as last version Signed-off-by: Giuseppe Scrivano --- .../lookup_plugins/openshift_master_facts_default_priorities.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roles/openshift_master_facts/lookup_plugins') 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 95ace7923..ea54b44d2 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 @@ -88,7 +88,7 @@ class LookupModule(LookupBase): {'name': 'InterPodAffinityPriority', 'weight': 1} ]) - if short_version in ['1.5', '1.6']: + if short_version in ['1.5', '1.6', 'latest']: priorities.extend([ {'name': 'SelectorSpreadPriority', 'weight': 1}, {'name': 'InterPodAffinityPriority', 'weight': 1}, -- cgit v1.2.3 From bf32924f7d1e229d7022f0a102f483c82536e30b Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 8 Feb 2017 13:43:15 +0100 Subject: master: latest use same predicates as last version Signed-off-by: Giuseppe Scrivano --- .../lookup_plugins/openshift_master_facts_default_predicates.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roles/openshift_master_facts/lookup_plugins') 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 0c94228c6..d1a08fe37 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 @@ -98,7 +98,7 @@ class LookupModule(LookupBase): {'name': 'MatchInterPodAffinity'} ]) - if short_version in ['1.5', '1.6']: + if short_version in ['1.5', '1.6', 'latest']: predicates.extend([ {'name': 'NoVolumeZoneConflict'}, {'name': 'MaxEBSVolumeCount'}, -- cgit v1.2.3 From c4c39c1fcbc619c2a6495e4abec5e455f5f61965 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 8 Feb 2017 22:31:28 +0100 Subject: fixup! master: latest use same priorities as last version --- .../lookup_plugins/openshift_master_facts_default_priorities.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'roles/openshift_master_facts/lookup_plugins') 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 ea54b44d2..6ad40e748 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 @@ -53,6 +53,9 @@ class LookupModule(LookupBase): # convert short_version to origin short_version short_version = re.sub('^3.', '1.', short_version) + if short_version == 'latest': + short_version = '1.6' + if short_version == '1.1': priorities.extend([ {'name': 'LeastRequestedPriority', 'weight': 1}, @@ -88,7 +91,7 @@ class LookupModule(LookupBase): {'name': 'InterPodAffinityPriority', 'weight': 1} ]) - if short_version in ['1.5', '1.6', 'latest']: + if short_version in ['1.5', '1.6']: priorities.extend([ {'name': 'SelectorSpreadPriority', 'weight': 1}, {'name': 'InterPodAffinityPriority', 'weight': 1}, -- cgit v1.2.3 From e0a41641d796192c0b2e739f645b037304b9f926 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 8 Feb 2017 22:31:38 +0100 Subject: fixup! master: latest use same predicates as last version --- .../lookup_plugins/openshift_master_facts_default_predicates.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'roles/openshift_master_facts/lookup_plugins') 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 d1a08fe37..ef322bd7d 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,6 +52,9 @@ class LookupModule(LookupBase): # convert short_version to origin short_version short_version = re.sub('^3.', '1.', short_version) + if short_version == 'latest': + short_version = '1.6' + # Predicates ordered according to OpenShift Origin source: # origin/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go @@ -98,7 +101,7 @@ class LookupModule(LookupBase): {'name': 'MatchInterPodAffinity'} ]) - if short_version in ['1.5', '1.6', 'latest']: + if short_version in ['1.5', '1.6']: predicates.extend([ {'name': 'NoVolumeZoneConflict'}, {'name': 'MaxEBSVolumeCount'}, -- cgit v1.2.3