From bbe9bcf36d6bb31cee8c82f4fa2f340460e547e6 Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Thu, 15 Feb 2024 05:47:43 +0100 Subject: [PATCH] Re-introduce exclude capi-webhook-system to fix test flake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Büringer buringerst@vmware.com --- test/framework/clusterctl/clusterctl_helpers.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/framework/clusterctl/clusterctl_helpers.go b/test/framework/clusterctl/clusterctl_helpers.go index ec56339ad43a..b38d45f64c83 100644 --- a/test/framework/clusterctl/clusterctl_helpers.go +++ b/test/framework/clusterctl/clusterctl_helpers.go @@ -184,7 +184,14 @@ func UpgradeManagementClusterAndWait(ctx context.Context, input UpgradeManagemen client := input.ClusterProxy.GetClient() log.Logf("Waiting for provider controllers to be running") - controllersDeployments := framework.GetControllerDeployments(ctx, framework.GetControllerDeploymentsInput{Lister: client}) + controllersDeployments := framework.GetControllerDeployments(ctx, framework.GetControllerDeploymentsInput{ + Lister: client, + // This namespace has been dropped in v0.4.x. + // We have to exclude this namespace here as after an upgrade from v0.3x there won't + // be a controller in this namespace anymore and if we wait for it to come up the test would fail. + // Note: We can drop this as soon as we don't have a test upgrading from v0.3.x anymore. + ExcludeNamespaces: []string{"capi-webhook-system"}, + }) Expect(controllersDeployments).ToNot(BeEmpty(), "The list of controller deployments should not be empty") for _, deployment := range controllersDeployments { framework.WaitForDeploymentsAvailable(ctx, framework.WaitForDeploymentsAvailableInput{