From 6f0d9a4a95040e9d6f0a9e5eb636aeca885dc2dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Schw=C3=A4gerl?= Date: Wed, 5 Feb 2025 13:24:41 +0100 Subject: [PATCH] extend unmanaging e2e test --- tests/e2e/module_unmanage_test.go | 44 ++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/tests/e2e/module_unmanage_test.go b/tests/e2e/module_unmanage_test.go index 406b59b010..9f8e0477c1 100644 --- a/tests/e2e/module_unmanage_test.go +++ b/tests/e2e/module_unmanage_test.go @@ -180,7 +180,9 @@ var _ = Describe("Unmanaging Kyma Module", Ordered, func() { Should(Succeed()) }) - It("When Module is enabled again", func() { + It("When Module is enabled again with CustomResourcePolicy:Ignore", func() { + module.CustomResourcePolicy = v1beta2.CustomResourcePolicyIgnore + Eventually(EnableModule). WithContext(ctx). WithArguments(skrClient, defaultRemoteKymaName, RemoteNamespace, module). @@ -203,5 +205,45 @@ var _ = Describe("Unmanaging Kyma Module", Ordered, func() { WithArguments(kyma.GetName(), kyma.GetNamespace(), kcpClient, shared.StateReady). Should(Succeed()) }) + + It("When Module is unmanaged", func() { + Eventually(SetModuleManaged). + WithContext(ctx). + WithArguments(skrClient, defaultRemoteKymaName, RemoteNamespace, module.Name, false). + Should(Succeed()) + + By("And Manifest CR is removed") + Eventually(NoManifestExist). + WithContext(ctx). + WithArguments(kcpClient). + Should(Succeed()) + + By("And Module Operator Deployment is not removed on SKR cluster") + Consistently(CheckIfExists). + WithContext(ctx). + WithArguments(ModuleResourceName, TestModuleResourceNamespace, + "apps", "v1", "Deployment", skrClient). + Should(Succeed()) + + By("And all manifest resources no longer have managed-by labels") + for _, resource := range manifestResources { + objectKey := client.ObjectKey{Name: resource.Name, Namespace: resource.Namespace} + gvk := schema.GroupVersionKind{ + Group: resource.Group, + Version: resource.Version, + Kind: resource.Kind, + } + Eventually(HasExpectedLabel). + WithContext(ctx). + WithArguments(skrClient, objectKey, gvk, + shared.ManagedBy, shared.ManagedByLabelValue).Should(Equal(ErrLabelNotFound)) + } + + By("And KCP Kyma CR is in \"Ready\" State") + Eventually(KymaIsInState). + WithContext(ctx). + WithArguments(kyma.GetName(), kyma.GetNamespace(), kcpClient, shared.StateReady). + Should(Succeed()) + }) }) })