From ef2203012afcce82ac5486f1bea0130ed3ab98da Mon Sep 17 00:00:00 2001 From: Teddy Andrieux Date: Fri, 15 May 2020 11:46:06 +0200 Subject: [PATCH] salt: Downgrade pre-check allow saltenv >= higher node Node version represent the version desired on a specific node and not the actual deployed version so if for any reason a downgrade failed after all node version being set to the destination one, we want to be able to run the downgrade again so the saltenv specified may be higher that all the node versions Fixes: #2551 --- salt/metalk8s/orchestrate/downgrade/precheck.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/metalk8s/orchestrate/downgrade/precheck.sls b/salt/metalk8s/orchestrate/downgrade/precheck.sls index 3db2015d62..02f9e71582 100644 --- a/salt/metalk8s/orchestrate/downgrade/precheck.sls +++ b/salt/metalk8s/orchestrate/downgrade/precheck.sls @@ -4,7 +4,7 @@ {%- set nodes_versions = pillar.metalk8s.nodes.values() | map(attribute='version') | list %} {%- do nodes_versions.sort(cmp=salt.pkg.version_cmp, reverse=True) %} {%- set expected = nodes_versions | first %} -{%- if saltenv != 'metalk8s-' ~ expected %} +{%- if salt.pkg.version_cmp(saltenv, 'metalk8s-' ~ expected) >= 0 %} Invalid saltenv "{{ saltenv }}" consider using "metalk8s-{{ expected }}": test.fail_without_changes