Skip to content

Commit d08769f

Browse files
ensures mcn spec is updated with correct desiredconfig
1 parent 9596e8f commit d08769f

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

pkg/daemon/update.go

+17
Original file line numberDiff line numberDiff line change
@@ -936,6 +936,23 @@ func (dn *Daemon) updateOnClusterBuild(oldConfig, newConfig *mcfgv1.MachineConfi
936936
return err
937937
}
938938

939+
// Determine the pool (worker or master) based on the node's labels
940+
pool := ""
941+
var ok bool
942+
if dn.node != nil {
943+
if _, ok = dn.node.Labels["node-role.kubernetes.io/worker"]; ok {
944+
pool = "worker"
945+
} else if _, ok = dn.node.Labels["node-role.kubernetes.io/master"]; ok {
946+
pool = "master"
947+
}
948+
}
949+
950+
// Ensure the MCN spec is updated with the correct desiredConfig
951+
err = upgrademonitor.GenerateAndApplyMachineConfigNodeSpec(dn.featureGatesAccessor, pool, dn.node, dn.mcfgClient)
952+
if err != nil {
953+
return fmt.Errorf("error updating MCN spec for node %s: %w", dn.node.Name, err)
954+
}
955+
939956
defer func() {
940957
if retErr != nil {
941958
odc.currentConfig = oldConfig

0 commit comments

Comments
 (0)