From 7aba1efc81e4154652f70f932d8ec47efffbfc26 Mon Sep 17 00:00:00 2001 From: fabriziopandini Date: Tue, 26 Aug 2025 14:45:09 +0200 Subject: [PATCH] tmp fix for ResourceVersion flake --- test/e2e/cluster_upgrade_runtimesdk_test.go | 2 +- test/e2e/ownerrefs_finalizers_test.go | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/test/e2e/cluster_upgrade_runtimesdk_test.go b/test/e2e/cluster_upgrade_runtimesdk_test.go index bb7229d608..3dddf60e46 100644 --- a/test/e2e/cluster_upgrade_runtimesdk_test.go +++ b/test/e2e/cluster_upgrade_runtimesdk_test.go @@ -55,7 +55,7 @@ var _ = Describe("When upgrading a workload cluster using ClusterClass with Runt // This check ensures that the resourceVersions are stable, i.e. it verifies there are no // continuous reconciles when everything should be stable. - framework.ValidateResourceVersionStable(ctx, proxy, namespace, FilterObjectsWithKindAndName(clusterName)) + framework.ValidateResourceVersionStable(ctx, proxy, namespace, TMPDropVSphereMachineAndFilterObjectsWithKindAndName(clusterName)) }, // "topology-runtimesdk" is the same as the "topology" flavor but with an additional RuntimeExtension. Flavor: ptr.To(testSpecificSettingsGetter().FlavorForMode("topology-runtimesdk")), diff --git a/test/e2e/ownerrefs_finalizers_test.go b/test/e2e/ownerrefs_finalizers_test.go index a2a2bb0090..1b51ff5f39 100644 --- a/test/e2e/ownerrefs_finalizers_test.go +++ b/test/e2e/ownerrefs_finalizers_test.go @@ -489,6 +489,20 @@ func forcePeriodicDeploymentZoneReconcile(ctx context.Context, c ctrlclient.Clie }() } +func TMPDropVSphereMachineAndFilterObjectsWithKindAndName(clusterName string) func(u unstructured.Unstructured) bool { + f := FilterObjectsWithKindAndName(clusterName) + + return func(u unstructured.Unstructured) bool { + if testMode == SupervisorTestMode { + // temporarily drop VSphereMachine while we found a fix for https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/issues/3592 + if sets.NewString("VSphereMachine").Has(u.GetKind()) { + return false + } + } + return f(u) + } +} + func FilterObjectsWithKindAndName(clusterName string) func(u unstructured.Unstructured) bool { f := clusterctlcluster.FilterClusterObjectsWithNameFilter(clusterName)