diff --git a/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer.go b/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer.go index 26fb92f131..00beac3ebd 100644 --- a/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer.go +++ b/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer.go @@ -377,11 +377,13 @@ func (*Sequencer) Reset(r runtime.Runtime, in runtime.ResetOptions) []runtime.Ph // Shutdown is the shutdown sequence. func (*Sequencer) Shutdown(r runtime.Runtime, in *machineapi.ShutdownRequest) []runtime.Phase { + skipNodeRegistration := r.Config() != nil && r.Config().Machine() != nil && r.Config().Machine().Kubelet().SkipNodeRegistration() + phases := PhaseList{}.Append( "storeShudown", StoreShutdownEmergency, ).AppendWhen( - !in.GetForce() && !r.Config().Machine().Kubelet().SkipNodeRegistration(), + !in.GetForce() && !skipNodeRegistration, "drain", CordonAndDrainNode, ).Append(