Skip to content

Commit 4a9fd9d

Browse files
authored
Merge pull request kubernetes-sigs#11044 from vincepri/followup-11032
🌱 Follow-up PR nits from 11032
2 parents 044dca2 + 6462c22 commit 4a9fd9d

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

internal/controllers/machine/machine_controller_test.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2547,6 +2547,7 @@ func TestNodeDeletionWithoutNodeRefFallback(t *testing.T) {
25472547
Namespace: metav1.NamespaceDefault,
25482548
Labels: map[string]string{
25492549
clusterv1.MachineControlPlaneLabel: "",
2550+
clusterv1.ClusterNameLabel: "test-cluster",
25502551
},
25512552
Annotations: map[string]string{
25522553
"machine.cluster.x-k8s.io/exclude-node-draining": "",
@@ -2592,7 +2593,6 @@ func TestNodeDeletionWithoutNodeRefFallback(t *testing.T) {
25922593
name string
25932594
deletionTimeout *metav1.Duration
25942595
resultErr bool
2595-
clusterDeleted bool
25962596
expectNodeDeletion bool
25972597
createFakeClient func(...client.Object) client.Client
25982598
}{
@@ -2627,10 +2627,6 @@ func TestNodeDeletionWithoutNodeRefFallback(t *testing.T) {
26272627
}
26282628

26292629
cluster := testCluster.DeepCopy()
2630-
if tc.clusterDeleted {
2631-
cluster.DeletionTimestamp = &metav1.Time{Time: deletionTime.Add(time.Hour)}
2632-
}
2633-
26342630
_, err := r.reconcileDelete(context.Background(), cluster, m)
26352631

26362632
if tc.resultErr {
@@ -2639,7 +2635,7 @@ func TestNodeDeletionWithoutNodeRefFallback(t *testing.T) {
26392635
g.Expect(err).ToNot(HaveOccurred())
26402636
if tc.expectNodeDeletion {
26412637
n := &corev1.Node{}
2642-
g.Expect(fakeClient.Get(context.Background(), client.ObjectKeyFromObject(node), n)).NotTo(Succeed())
2638+
g.Expect(apierrors.IsNotFound(fakeClient.Get(context.Background(), client.ObjectKeyFromObject(node), n))).To(BeTrue())
26432639
}
26442640
}
26452641
})

0 commit comments

Comments
 (0)