Merge branch 'bugfix/add-refresh-grains-after-sync-all' into q/130.0

Author: bert-e

CHANGELOG.md

@@ -18,6 +18,12 @@
 - Make sure the apiserver is running after reconfiguring the pod
   (PR[#4611](https://github.com/scality/metalk8s/pull/4611))
 
+### Enhancements
+
+- Add a `saltutil.refresh_grains` after each `saltutil.sync_all` 
+  to ensure the grains are up to date 
+  (PR[#4598](https://github.com/scality/metalk8s/pull/4598))
+
 ## Release 130.0.0
 
 ### Enhancements
@@ -77,12 +83,13 @@
   (PR[#4563](https://github.com/scality/metalk8s/pull/4563))
 
 - Add a hash annotation to force restart backup server on 
-  certifacate renewal (PR[#4590](https://github.com/scality/metalk8s/pull/4590))
+  certificate renewal (PR[#4590](https://github.com/scality/metalk8s/pull/4590))
 
 - Add alerts for a CronJob owned Job failure and another one for
-  non-CronJob owned Job failure 
+  non-CronJob owned Job failure
   (PR[#4584](https://github.com/scality/metalk8s/pull/4584))
 
+
 ## Release 129.0.3 (in development)
 
 ### Enhancements

salt/metalk8s/orchestrate/apiserver.sls

@@ -17,6 +17,14 @@ Sync {{ node }} minion:
     - kwarg:
         saltenv: metalk8s-{{ dest_version }}
 
+Refresh {{ node }} grains:
+  salt.function:
+    - name: saltutil.refresh_grains
+    - tgt: {{ node }}
+    - timeout: 120
+    - require:
+      - salt: Sync {{ node }} minion
+
 Check pillar on {{ node }}:
   salt.function:
     - name: metalk8s.check_pillar_keys
@@ -31,7 +39,7 @@ Check pillar on {{ node }}:
     - retry:
         attempts: 5
     - require:
-      - salt: Sync {{ node }} minion
+      - salt: Refresh {{ node }} grains
 
 Deploy apiserver {{ node }} to {{ dest_version }}:
   salt.state:

salt/metalk8s/orchestrate/bootstrap/init.sls

@@ -90,6 +90,14 @@ Sync bootstrap minion:
   - kwarg:
       saltenv: metalk8s-{{ version }}
 
+Refresh bootstrap minion grains:
+  salt.function:
+  - name: saltutil.refresh_grains
+  - tgt: {{ pillar.bootstrap_id }}
+  - timeout: 120
+  - require:
+    - salt: Sync bootstrap minion
+
 Deploy CA role on bootstrap minion:
   salt.state:
   - tgt: {{ pillar.bootstrap_id }}
@@ -98,15 +106,15 @@ Deploy CA role on bootstrap minion:
   - saltenv: metalk8s-{{ version }}
   - pillar: {{ pillar_data | tojson }}
   - require:
-    - salt: Sync bootstrap minion
+    - salt: Refresh bootstrap minion grains
 
 Bring bootstrap minion to highstate:
   salt.state:
   - tgt: {{ pillar.bootstrap_id }}
   - highstate: true
   - pillar: {{ pillar_data | tojson }}
   - require:
-    - salt: Sync bootstrap minion
+    - salt: Refresh bootstrap minion grains
     - salt: Deploy CA role on bootstrap minion
 
 Wait for API server to be available:

salt/metalk8s/orchestrate/deploy_node.sls

@@ -108,14 +108,22 @@ Sync module on the node:
     - kwarg:
         saltenv: metalk8s-{{ version }}
 
+Refresh the node grains:
+  salt.function:
+    - name: saltutil.refresh_grains
+    - tgt: {{ node_name }}
+    - timeout: 120
+    - require:
+      - salt: Sync module on the node
+
 Set grains:
   salt.state:
     - tgt: {{ node_name }}
     - saltenv: metalk8s-{{ version }}
     - sls:
       - metalk8s.node.grains
     - require:
-      - salt: Sync module on the node
+      - salt: Refresh the node grains
 
 Refresh the mine:
   salt.function:
@@ -167,7 +175,7 @@ Check pillar before salt-minion configuration:
     - retry:
         attempts: 5
     - require:
-      - salt: Sync module on the node
+      - salt: Refresh the node grains
 
 Reconfigure salt-minion:
   salt.state:
@@ -216,7 +224,7 @@ Check pillar before etcd deployment:
     - retry:
         attempts: 5
     - require:
-      - salt: Sync module on the node
+      - salt: Refresh the node grains
       - salt: Wait minion available
 
 Install etcd node:
@@ -271,7 +279,7 @@ Check pillar before highstate:
     - retry:
         attempts: 5
     - require:
-      - salt: Sync module on the node
+      - salt: Refresh the node grains
       - http: Wait for API server to be available before highstate
 
 Run the highstate:

salt/metalk8s/orchestrate/etcd.sls

@@ -18,6 +18,14 @@ Sync {{ node }} minion:
     - kwarg:
         saltenv: metalk8s-{{ dest_version }}
 
+Refresh {{ node }} grains:
+  salt.function:
+    - name: saltutil.refresh_grains
+    - tgt: {{ node }}
+    - timeout: 120
+    - require:
+      - salt: Sync {{ node }} minion
+
 Check pillar on {{ node }}:
   salt.function:
     - name: metalk8s.check_pillar_keys
@@ -32,7 +40,7 @@ Check pillar on {{ node }}:
     - retry:
         attempts: 5
     - require:
-      - salt: Sync {{ node }} minion
+      - salt: Refresh {{ node }} grains
 
 Deploy etcd {{ node }} to {{ dest_version }}:
   salt.state:

scripts/bootstrap.sh.in

@@ -133,6 +133,9 @@ orchestrate_bootstrap() {
             refresh=True \
             saltenv=metalk8s-@@VERSION
 
+    run "Refreshing grains on bootstrap minion" \
+        salt-call --state-output=mixed saltutil.refresh_grains
+
     run "Deploying bootstrap node (this may take a while)" \
         "${SALT_MASTER_CALL[@]}" salt-run --state-output=mixed state.orchestrate \
             metalk8s.orchestrate.bootstrap \

scripts/common.sh.in

@@ -307,6 +307,8 @@ configure_salt_minion_local_mode() {
 
     "$SALT_CALL" --file-root="$file_root" \
         --local --retcode-passthrough saltutil.sync_all saltenv=base
+    "$SALT_CALL" --file-root="$file_root" \
+        --local --retcode-passthrough saltutil.refresh_grains
     # Workaround waiting for Rocky Linux support in Salt
     "$SALT_CALL" --file-root="$file_root" \
         --local --retcode-passthrough state.sls \

scripts/restore.sh.in

@@ -203,6 +203,8 @@ configure_salt_master() {
         refresh=True \
         saltenv=metalk8s-@@VERSION
 
+    "${SALT_CALL}" --retcode-passthrough saltutil.refresh_grains
+
     "${SALT_CALL}" --retcode-passthrough --state-output=mixed state.sls \
         metalk8s.kubernetes.kubelet \
         saltenv=metalk8s-@@VERSION \

scripts/upgrade.sh.in

@@ -78,6 +78,7 @@ trap cleanup EXIT
 
 upgrade_bootstrap () {
     "$SALT_CALL" saltutil.sync_all saltenv="$SALTENV"
+    "$SALT_CALL" saltutil.refresh_grains
 
     SALT_MASTER_CALL=(crictl exec -i "$(get_salt_container)")
     "${SALT_MASTER_CALL[@]}" salt-run state.orchestrate \
@@ -86,6 +87,7 @@ upgrade_bootstrap () {
 
     # Upgrade salt-master in local mode since salt-master will restart
     "$SALT_CALL" --local saltutil.sync_all saltenv="$SALTENV" refresh=True
+    "$SALT_CALL" --local saltutil.refresh_grains
     "$SALT_CALL" --local --retcode-passthrough state.sls \
         metalk8s.salt.master.installed saltenv="$SALTENV"
 }