Skip to content

Commit 2b68d28

Browse files
committed
Added new failing test to showcase bug ticket
1 parent 0bfa3d8 commit 2b68d28

File tree

12 files changed

+1088
-220
lines changed

12 files changed

+1088
-220
lines changed

controllers/selfnoderemediation_controller.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,16 +463,20 @@ func (r *SelfNodeRemediationReconciler) remediateWithResourceRemoval(ctx context
463463
var err error
464464
switch phase {
465465
case fencingStartedPhase:
466+
r.logger.Info("remediateWithResourceRemoval: entered fencing start phase")
466467
result, err = r.handleFencingStartedPhase(ctx, node, snr)
467468
case preRebootCompletedPhase:
469+
r.logger.Info("remediateWithResourceRemoval: entered pre reboot completed phase")
468470
result, err = r.handlePreRebootCompletedPhase(node, snr)
469471
case rebootCompletedPhase:
472+
r.logger.Info("remediateWithResourceRemoval: entered reboot completed phase")
470473
result, err = r.handleRebootCompletedPhase(node, snr, rmNodeResources)
471474
case fencingCompletedPhase:
475+
r.logger.Info("remediateWithResourceRemoval: entered fencing complete phase")
472476
result, err = r.handleFencingCompletedPhase(node, snr)
473477
default:
474478
// this should never happen since we enforce valid values with kubebuilder
475-
err = errors.New("unknown phase")
479+
err = fmt.Errorf("remediateWithResourceRemoval: unknown phase (%s)", phase)
476480
r.logger.Error(err, "Undefined unknown phase", "phase", phase)
477481
}
478482
return result, err
@@ -506,6 +510,7 @@ func (r *SelfNodeRemediationReconciler) prepareReboot(ctx context.Context, node
506510
}
507511

508512
preRebootCompleted := string(preRebootCompletedPhase)
513+
r.logger.Info("pre-reboot completed")
509514
snr.Status.Phase = &preRebootCompleted
510515

511516
return ctrl.Result{}, nil
@@ -636,7 +641,8 @@ func (r *SelfNodeRemediationReconciler) didIRebootMyself(snr *v1alpha1.SelfNodeR
636641
func (r *SelfNodeRemediationReconciler) isNodeRebootCapable(node *v1.Node) bool {
637642
//make sure that the unhealthy node has self node remediation pod on it which can reboot it
638643
if _, err := utils.GetSelfNodeRemediationAgentPod(node.Name, r.Client); err != nil {
639-
r.logger.Error(err, "failed to get self node remediation agent pod resource")
644+
r.logger.Error(err, "failed to get self node remediation agent pod resource, so that makes this node "+
645+
"not reboot capable")
640646
return false
641647
}
642648

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)