Skip to content

OCPBUGS-67229: Set NodeDegraded MCN condition when node state annotation is set to Degraded #5509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
isabella-janssen wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −7
Open

OCPBUGS-67229: Set NodeDegraded MCN condition when node state annotation is set to Degraded #5509

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions pkg/daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,15 +649,32 @@ type unreconcilableErr struct {
error
}

// updateErrorState calls `SetUnreconcilable` to set the node's state annotation value to
// "Unreconcilable" and the associated reason annotation if the provided error is an unreconcilable
// error. Otherwise it calls `updateDegradedState` to set the node's state annotation value to
// "Degraded," populate the associated reason annotation, and set the degrade condition in the MCN.
func (dn *Daemon) updateErrorState(err error) error {
var uErr *unreconcilableErr
if errors.As(err, &uErr) {
dn.nodeWriter.SetUnreconcilable(err)
} else {
if err := dn.nodeWriter.SetDegraded(err); err != nil {
return err
}
return dn.nodeWriter.SetUnreconcilable(err)
}
return dn.updateDegradedState(err)
}

// `updateDegradedState` calls `SetDegraded` to set the node's state annotation value to "Degraded"
// and populate the associated reason annotation. It then sets the degrade condition in the MCN.
func (dn *Daemon) updateDegradedState(err error) error {
// Set node state annotation to "Degraded"
if setErr := dn.nodeWriter.SetDegraded(err); setErr != nil {
return setErr
}
// Get MCP associated with node
pool, poolErr := helpers.GetPrimaryPoolNameForMCN(dn.mcpLister, dn.node)
if poolErr != nil {
return poolErr
}
// Set the node's MCN condition to "Degraded"
dn.reportMachineNodeDegradeStatus(err, pool)
return nil
}

Expand Down Expand Up @@ -2419,7 +2436,7 @@ func (dn *Daemon) runOnceFromMachineConfig(machineConfig mcfgv1.MachineConfig, c
// NOTE: This case expects a cluster to exists already.
ufc, err := dn.prepUpdateFromCluster()
if err != nil {
if err := dn.nodeWriter.SetDegraded(err); err != nil {
if err := dn.updateDegradedState(err); err != nil {
return err
}
return err
Expand All @@ -2429,7 +2446,7 @@ func (dn *Daemon) runOnceFromMachineConfig(machineConfig mcfgv1.MachineConfig, c
}
// At this point we have verified we need to update
if err = dn.triggerUpdateWithMachineConfig(ufc.currentConfig, &machineConfig, false); err != nil {
dn.nodeWriter.SetDegraded(err)
dn.updateDegradedState(err)
return err
}
return nil
Expand Down