Merge branch 'improvement/fix-apiserver-deploy-order' into tmp/octopus/w/130.0/improvement/fix-apiserver-deploy-order

Author: bert-e

CHANGELOG.md

@@ -123,6 +123,12 @@
   image to `rockylinux:9.5-minimal`
   (PR[#4483](https://github.com/scality/metalk8s/pull/4483))
 
+### Bug fixes
+
+- Fix a bug where upgrading apiserver on a non-bootstrap node
+  before the bootstrap would throw an error.
+  (PR[#4514](https://github.com/scality/metalk8s/pull/4514))
+
 ## Release 128.0.3 (in development)
 
 ### Enhancements

salt/metalk8s/orchestrate/apiserver.sls

@@ -1,7 +1,14 @@
 {%- set dest_version = pillar.metalk8s.cluster_version %}
-{%- set master_nodes = salt.metalk8s.minions_by_role('master') %}
+{%- set master_nodes = salt.metalk8s.minions_by_role('master') | sort %}
+{%- set bootstrap_nodes = salt.metalk8s.minions_by_role('bootstrap') | sort %}
 
-{%- for node in master_nodes | sort %}
+# move bootstrap nodes to beginning of list
+{%- for node in bootstrap_nodes %}
+{%- do master_nodes.remove(node) %}
+{%- do master_nodes.insert(0, node) %}
+{%- endfor %}
+
+{%- for node in master_nodes %}
 
 Sync {{ node }} minion:
   salt.function: