From 26a76d49441c9ef9243acf3c4059527628d89d2b Mon Sep 17 00:00:00 2001 From: killianmuldoon Date: Fri, 10 Mar 2023 19:18:27 +0000 Subject: [PATCH] Merge ownerReference tests with quick start --- test/e2e/quick_start_test.go | 67 ++++++++++++------------------------ 1 file changed, 22 insertions(+), 45 deletions(-) diff --git a/test/e2e/quick_start_test.go b/test/e2e/quick_start_test.go index 482ef04b726d..cbec475dc7b8 100644 --- a/test/e2e/quick_start_test.go +++ b/test/e2e/quick_start_test.go @@ -34,6 +34,17 @@ var _ = Describe("When following the Cluster API quick-start [PR-Blocking]", fun BootstrapClusterProxy: bootstrapClusterProxy, ArtifactFolder: artifactFolder, SkipCleanup: skipCleanup, + PostMachinesProvisioned: func(proxy framework.ClusterProxy, namespace, clusterName string) { + // This check ensures that owner references are resilient - i.e. correctly re-reconciled - when removed. + framework.ValidateOwnerReferencesResilience(ctx, proxy, namespace, clusterName, + framework.CoreTypeOwnerReferenceAssertion, + framework.ExpOwnerReferenceAssertions, + framework.DockerInfraOwnerReferenceAssertions, + framework.KubeadmBootstrapOwnerReferenceAssertions, + framework.KubeadmControlPlaneOwnerReferenceAssertions, + framework.KubernetesReferenceAssertions, + ) + }, } }) }) @@ -47,6 +58,17 @@ var _ = Describe("When following the Cluster API quick-start with ClusterClass [ ArtifactFolder: artifactFolder, SkipCleanup: skipCleanup, Flavor: pointer.String("topology"), + // This check ensures that owner references are resilient - i.e. correctly re-reconciled - when removed. + PostMachinesProvisioned: func(proxy framework.ClusterProxy, namespace, clusterName string) { + framework.ValidateOwnerReferencesResilience(ctx, proxy, namespace, clusterName, + framework.CoreTypeOwnerReferenceAssertion, + framework.ExpOwnerReferenceAssertions, + framework.DockerInfraOwnerReferenceAssertions, + framework.KubeadmBootstrapOwnerReferenceAssertions, + framework.KubeadmControlPlaneOwnerReferenceAssertions, + framework.KubernetesReferenceAssertions, + ) + }, } }) }) @@ -77,48 +99,3 @@ var _ = Describe("When following the Cluster API quick-start with Ignition", fun } }) }) - -var _ = Describe("When following the Cluster API quick-start check owner references are correctly reconciled and rereconciled if deleted", func() { - QuickStartSpec(ctx, func() QuickStartSpecInput { - return QuickStartSpecInput{ - E2EConfig: e2eConfig, - ClusterctlConfigPath: clusterctlConfigPath, - BootstrapClusterProxy: bootstrapClusterProxy, - ArtifactFolder: artifactFolder, - SkipCleanup: skipCleanup, - PostMachinesProvisioned: func(proxy framework.ClusterProxy, namespace, clusterName string) { - framework.ValidateOwnerReferencesResilience(ctx, proxy, namespace, clusterName, - framework.CoreTypeOwnerReferenceAssertion, - framework.ExpOwnerReferenceAssertions, - framework.DockerInfraOwnerReferenceAssertions, - framework.KubeadmBootstrapOwnerReferenceAssertions, - framework.KubeadmControlPlaneOwnerReferenceAssertions, - framework.KubernetesReferenceAssertions, - ) - }, - } - }) -}) - -var _ = Describe("When following the Cluster API quick-start with ClusterClass check owner references are correctly reconciled and rereconciled if deleted [ClusterClass]", func() { - QuickStartSpec(ctx, func() QuickStartSpecInput { - return QuickStartSpecInput{ - E2EConfig: e2eConfig, - ClusterctlConfigPath: clusterctlConfigPath, - BootstrapClusterProxy: bootstrapClusterProxy, - ArtifactFolder: artifactFolder, - SkipCleanup: skipCleanup, - Flavor: pointer.String("topology"), - PostMachinesProvisioned: func(proxy framework.ClusterProxy, namespace, clusterName string) { - framework.ValidateOwnerReferencesResilience(ctx, proxy, namespace, clusterName, - framework.CoreTypeOwnerReferenceAssertion, - framework.ExpOwnerReferenceAssertions, - framework.DockerInfraOwnerReferenceAssertions, - framework.KubeadmBootstrapOwnerReferenceAssertions, - framework.KubeadmControlPlaneOwnerReferenceAssertions, - framework.KubernetesReferenceAssertions, - ) - }, - } - }) -})