From 77ac9403775603b9ad2e648ebcab045a69b0e924 Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Fri, 31 May 2024 16:57:25 +0200 Subject: [PATCH] Fix some KCP unit test flakes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Büringer buringerst@vmware.com --- controlplane/kubeadm/internal/controllers/controller_test.go | 2 +- controlplane/kubeadm/internal/controllers/scale_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/controlplane/kubeadm/internal/controllers/controller_test.go b/controlplane/kubeadm/internal/controllers/controller_test.go index 6459174a918a..68cc9cbefccc 100644 --- a/controlplane/kubeadm/internal/controllers/controller_test.go +++ b/controlplane/kubeadm/internal/controllers/controller_test.go @@ -1226,7 +1226,7 @@ func TestReconcileInitializeControlPlane(t *testing.T) { }, }, } - g.Expect(env.Create(ctx, genericInfrastructureMachineTemplate)).To(Succeed()) + g.Expect(env.CreateAndWait(ctx, genericInfrastructureMachineTemplate)).To(Succeed()) kcp := &controlplanev1.KubeadmControlPlane{ ObjectMeta: metav1.ObjectMeta{ diff --git a/controlplane/kubeadm/internal/controllers/scale_test.go b/controlplane/kubeadm/internal/controllers/scale_test.go index d35db435bdfe..48766c5d7a43 100644 --- a/controlplane/kubeadm/internal/controllers/scale_test.go +++ b/controlplane/kubeadm/internal/controllers/scale_test.go @@ -62,7 +62,7 @@ func TestKubeadmControlPlaneReconciler_initializeControlPlane(t *testing.T) { defer teardown(t, g, namespace) cluster, kcp, genericInfrastructureMachineTemplate := createClusterWithControlPlane(namespace.Name) - g.Expect(env.Create(ctx, genericInfrastructureMachineTemplate, client.FieldOwner("manager"))).To(Succeed()) + g.Expect(env.CreateAndWait(ctx, genericInfrastructureMachineTemplate, client.FieldOwner("manager"))).To(Succeed()) kcp.UID = types.UID(util.RandomString(10)) r := &KubeadmControlPlaneReconciler{ @@ -128,7 +128,7 @@ func TestKubeadmControlPlaneReconciler_scaleUpControlPlane(t *testing.T) { defer teardown(t, g, namespace) cluster, kcp, genericInfrastructureMachineTemplate := createClusterWithControlPlane(namespace.Name) - g.Expect(env.Create(ctx, genericInfrastructureMachineTemplate, client.FieldOwner("manager"))).To(Succeed()) + g.Expect(env.CreateAndWait(ctx, genericInfrastructureMachineTemplate, client.FieldOwner("manager"))).To(Succeed()) kcp.UID = types.UID(util.RandomString(10)) setKCPHealthy(kcp)