Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-1.4] 馃悰 internal/machine-controller fix flakes in phases test #8590

Merged
merged 1 commit into from May 2, 2023
Merged

[release-1.4] 馃悰 internal/machine-controller fix flakes in phases test #8590

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 12 additions & 15 deletions internal/controllers/machine/machine_controller_phases_test.go
View file
Open in desktop
Expand Up @@ -213,12 +213,12 @@ func TestReconcileMachinePhases(t *testing.T) {

g.Expect(env.Create(ctx, bootstrapConfig)).To(Succeed())
g.Expect(env.Create(ctx, infraMachine)).To(Succeed())
// We have to subtract 2 seconds, because .status.lastUpdated does not contain miliseconds.
preUpdate := time.Now().Add(-2 * time.Second)
g.Expect(env.Create(ctx, machine)).To(Succeed())

// Set the LastUpdated to be able to verify it is updated when the phase changes
modifiedMachine := machine.DeepCopy()
lastUpdated := metav1.NewTime(time.Now().Add(-10 * time.Second))
machine.Status.LastUpdated = &lastUpdated
g.Expect(env.Status().Patch(ctx, modifiedMachine, client.MergeFrom(machine))).To(Succeed())

// Set bootstrap ready.
Expand All @@ -235,7 +235,7 @@ func TestReconcileMachinePhases(t *testing.T) {
g.Expect(machine.Status.GetTypedPhase()).To(Equal(clusterv1.MachinePhaseProvisioning))
// Verify that the LastUpdated timestamp was updated
g.Expect(machine.Status.LastUpdated).NotTo(BeNil())
g.Expect(machine.Status.LastUpdated.After(lastUpdated.Time)).To(BeTrue())
g.Expect(machine.Status.LastUpdated.After(preUpdate)).To(BeTrue())
return true
}, 10*time.Second).Should(BeTrue())
})
Expand Down Expand Up @@ -281,14 +281,13 @@ func TestReconcileMachinePhases(t *testing.T) {

g.Expect(env.Create(ctx, bootstrapConfig)).To(Succeed())
g.Expect(env.Create(ctx, infraMachine)).To(Succeed())
// We have to subtract 2 seconds, because .status.lastUpdated does not contain miliseconds.
preUpdate := time.Now().Add(-2 * time.Second)
g.Expect(env.Create(ctx, machine)).To(Succeed())

modifiedMachine := machine.DeepCopy()
// Set NodeRef.
machine.Status.NodeRef = &corev1.ObjectReference{Kind: "Node", Name: node.Name}
// Set the LastUpdated to be able to verify it is updated when the phase changes
lastUpdated := metav1.NewTime(time.Now().Add(-10 * time.Second))
machine.Status.LastUpdated = &lastUpdated
g.Expect(env.Status().Patch(ctx, modifiedMachine, client.MergeFrom(machine))).To(Succeed())

// Set bootstrap ready.
Expand Down Expand Up @@ -322,7 +321,7 @@ func TestReconcileMachinePhases(t *testing.T) {
g.Expect(machine.Status.GetTypedPhase()).To(Equal(clusterv1.MachinePhaseRunning))
// Verify that the LastUpdated timestamp was updated
g.Expect(machine.Status.LastUpdated).NotTo(BeNil())
g.Expect(machine.Status.LastUpdated.After(lastUpdated.Time)).To(BeTrue())
g.Expect(machine.Status.LastUpdated.After(preUpdate)).To(BeTrue())
return true
}, 10*time.Second).Should(BeTrue())
})
Expand Down Expand Up @@ -441,14 +440,13 @@ func TestReconcileMachinePhases(t *testing.T) {

g.Expect(env.Create(ctx, bootstrapConfig)).To(Succeed())
g.Expect(env.Create(ctx, infraMachine)).To(Succeed())
// We have to subtract 2 seconds, because .status.lastUpdated does not contain miliseconds.
preUpdate := time.Now().Add(-2 * time.Second)
g.Expect(env.Create(ctx, machine)).To(Succeed())

modifiedMachine := machine.DeepCopy()
// Set NodeRef.
machine.Status.NodeRef = &corev1.ObjectReference{Kind: "Node", Name: node.Name}
// Set the LastUpdated to be able to verify it is updated when the phase changes
lastUpdated := metav1.NewTime(time.Now().Add(-10 * time.Second))
machine.Status.LastUpdated = &lastUpdated
g.Expect(env.Status().Patch(ctx, modifiedMachine, client.MergeFrom(machine))).To(Succeed())

// Set bootstrap ready.
Expand All @@ -470,7 +468,7 @@ func TestReconcileMachinePhases(t *testing.T) {
g.Expect(machine.Status.GetTypedPhase()).To(Equal(clusterv1.MachinePhaseRunning))
// Verify that the LastUpdated timestamp was updated
g.Expect(machine.Status.LastUpdated).NotTo(BeNil())
g.Expect(machine.Status.LastUpdated.After(lastUpdated.Time)).To(BeTrue())
g.Expect(machine.Status.LastUpdated.After(preUpdate)).To(BeTrue())
return true
}, 10*time.Second).Should(BeTrue())
})
Expand Down Expand Up @@ -573,6 +571,8 @@ func TestReconcileMachinePhases(t *testing.T) {

g.Expect(env.Create(ctx, bootstrapConfig)).To(Succeed())
g.Expect(env.Create(ctx, infraMachine)).To(Succeed())
// We have to subtract 2 seconds, because .status.lastUpdated does not contain miliseconds.
preUpdate := time.Now().Add(-2 * time.Second)
g.Expect(env.Create(ctx, machine)).To(Succeed())

// Set bootstrap ready.
Expand All @@ -597,9 +597,6 @@ func TestReconcileMachinePhases(t *testing.T) {
modifiedMachine := machine.DeepCopy()
// Set NodeRef.
machine.Status.NodeRef = &corev1.ObjectReference{Kind: "Node", Name: node.Name}
// Set the LastUpdated to be able to verify it is updated when the phase changes
lastUpdated := metav1.NewTime(time.Now().Add(-10 * time.Second))
machine.Status.LastUpdated = &lastUpdated
g.Expect(env.Status().Patch(ctx, modifiedMachine, client.MergeFrom(machine))).To(Succeed())

modifiedMachine = machine.DeepCopy()
Expand All @@ -621,7 +618,7 @@ func TestReconcileMachinePhases(t *testing.T) {
g.Expect(nodeHealthyCondition.Reason).To(Equal(clusterv1.DeletingReason))
// Verify that the LastUpdated timestamp was updated
g.Expect(machine.Status.LastUpdated).NotTo(BeNil())
g.Expect(machine.Status.LastUpdated.After(lastUpdated.Time)).To(BeTrue())
g.Expect(machine.Status.LastUpdated.After(preUpdate)).To(BeTrue())
return true
}, 10*time.Second).Should(BeTrue())
})
Expand Down