Skip to content

Commit 0fc80b8

Browse files
committed
Added new failing test to showcase bug ticket
1 parent ee8985c commit 0fc80b8

File tree

12 files changed

+1087
-218
lines changed

12 files changed

+1087
-218
lines changed

controllers/selfnoderemediation_controller.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,16 +450,20 @@ func (r *SelfNodeRemediationReconciler) remediateWithResourceRemoval(ctx context
450450
var err error
451451
switch phase {
452452
case fencingStartedPhase:
453+
r.logger.Info("remediateWithResourceRemoval: entered fencing start phase")
453454
result, err = r.handleFencingStartedPhase(ctx, node, snr)
454455
case preRebootCompletedPhase:
456+
r.logger.Info("remediateWithResourceRemoval: entered pre reboot completed phase")
455457
result, err = r.handlePreRebootCompletedPhase(node, snr)
456458
case rebootCompletedPhase:
459+
r.logger.Info("remediateWithResourceRemoval: entered reboot completed phase")
457460
result, err = r.handleRebootCompletedPhase(node, snr, rmNodeResources)
458461
case fencingCompletedPhase:
462+
r.logger.Info("remediateWithResourceRemoval: entered fencing complete phase")
459463
result, err = r.handleFencingCompletedPhase(node, snr)
460464
default:
461465
// this should never happen since we enforce valid values with kubebuilder
462-
err = errors.New("unknown phase")
466+
err = fmt.Errorf("remediateWithResourceRemoval: unknown phase (%s)", phase)
463467
r.logger.Error(err, "Undefined unknown phase", "phase", phase)
464468
}
465469
return result, err
@@ -493,6 +497,7 @@ func (r *SelfNodeRemediationReconciler) prepareReboot(ctx context.Context, node
493497
}
494498

495499
preRebootCompleted := string(preRebootCompletedPhase)
500+
r.logger.Info("pre-reboot completed")
496501
snr.Status.Phase = &preRebootCompleted
497502

498503
return ctrl.Result{}, nil
@@ -623,7 +628,8 @@ func (r *SelfNodeRemediationReconciler) didIRebootMyself(snr *v1alpha1.SelfNodeR
623628
func (r *SelfNodeRemediationReconciler) isNodeRebootCapable(node *v1.Node) bool {
624629
//make sure that the unhealthy node has self node remediation pod on it which can reboot it
625630
if _, err := utils.GetSelfNodeRemediationAgentPod(node.Name, r.Client); err != nil {
626-
r.logger.Error(err, "failed to get self node remediation agent pod resource")
631+
r.logger.Error(err, "failed to get self node remediation agent pod resource, so that makes this node "+
632+
"not reboot capable")
627633
return false
628634
}
629635

controllers/tests/config/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ var _ = BeforeSuite(func() {
126126
MyNodeName: shared.UnhealthyNodeName,
127127
CheckInterval: shared.ApiCheckInterval,
128128
MaxErrorsThreshold: shared.MaxErrorThreshold,
129-
MinPeersForRemediation: shared.MinPeersForRemediation,
129+
MinPeersForRemediation: shared.MinPeersForRemediationConfigDefaultValue,
130130
Peers: peers,
131131
Cfg: cfg,
132132
CertReader: certReader,

0 commit comments

Comments
 (0)