rework managed service validation

Signed-off-by: Artem Bortnikov <[email protected]>
k0rdent · Jan 20, 2025 · 10e370c · 10e370c
1 parent 9a8bfd0
commit 10e370c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/test/e2e/clusterdeployment/servicevalidator.go b/test/e2e/clusterdeployment/servicevalidator.go
@@ -73,7 +73,7 @@ func (v *ServiceValidator) Validate(ctx context.Context, kc *kubeclient.KubeClie
 	clusterKubeClient := kc.NewFromCluster(ctx, v.namespace, v.clusterDeploymentName)
 
 	for resourceName, resource := range v.resourcesToValidate {
-		resourceFullName := resource.resourceFullName(v.managedServiceName)
+		resourceFullName := fmt.Sprintf("%s-%s", resource.resourceFullName(v.managedServiceName), "controller")
 		err := resource.ValidationFunc(ctx, clusterKubeClient, resourceFullName)
 		if err != nil {
 			_, _ = fmt.Fprintf(GinkgoWriter, "[%s/%s] validation error: %v\n", v.template, resourceName, err)

diff --git a/test/e2e/kubeclient/kubeclient.go b/test/e2e/kubeclient/kubeclient.go
@@ -384,7 +384,7 @@ func (kc *KubeClient) CreateMultiClusterService(
 		Group:    "k0rdent.mirantis.com",
 		Version:  "v1alpha1",
 		Resource: "multiclusterservices",
-	}, true)
+	}, false)
 
 	_, err := client.Create(ctx, multiClusterService, metav1.CreateOptions{})
 	if !apierrors.IsAlreadyExists(err) {

diff --git a/test/e2e/multi_provider_test.go b/test/e2e/multi_provider_test.go
@@ -185,7 +185,7 @@ var _ = Context("Multi Cloud Templates", Label("provider:cloud", "provider:aws-a
 		})
 
 		By("validating service is deployed", func() {
-			awsServiceDeployedValidator := clusterdeployment.NewServiceValidator(awsClusterDeploymentName, "default", "managed-ingress-nginx").
+			awsServiceDeployedValidator := clusterdeployment.NewServiceValidator(awsClusterDeploymentName, "managed-ingress-nginx", "default").
 				WithResourceValidation("service", clusterdeployment.ManagedServiceResource{
 					ResourceNameSuffix: "",
 					ValidationFunc:     clusterdeployment.ValidateService,
@@ -196,9 +196,9 @@ var _ = Context("Multi Cloud Templates", Label("provider:cloud", "provider:aws-a
 				})
 			Eventually(func() error {
 				return awsServiceDeployedValidator.Validate(context.Background(), kc)
-			}).WithTimeout(30 * time.Minute).WithPolling(10 * time.Second).Should(Succeed())
+			}).WithTimeout(10 * time.Minute).WithPolling(10 * time.Second).Should(Succeed())
 
-			azureServiceDeployedValidator := clusterdeployment.NewServiceValidator(azureClusterDeploymentName, "default", "managed-ingress-nginx").
+			azureServiceDeployedValidator := clusterdeployment.NewServiceValidator(azureClusterDeploymentName, "managed-ingress-nginx", "default").
 				WithResourceValidation("service", clusterdeployment.ManagedServiceResource{
 					ResourceNameSuffix: "",
 					ValidationFunc:     clusterdeployment.ValidateService,
@@ -209,7 +209,7 @@ var _ = Context("Multi Cloud Templates", Label("provider:cloud", "provider:aws-a
 				})
 			Eventually(func() error {
 				return azureServiceDeployedValidator.Validate(context.Background(), kc)
-			}).WithTimeout(30 * time.Minute).WithPolling(10 * time.Second).Should(Succeed())
+			}).WithTimeout(10 * time.Minute).WithPolling(10 * time.Second).Should(Succeed())
 		})
 	})
 })
diff --git a/test/e2e/provider_aws_test.go b/test/e2e/provider_aws_test.go
@@ -130,7 +130,7 @@ var _ = Describe("AWS Templates", Label("provider:cloud", "provider:aws"), Order
 			})
 		Eventually(func() error {
 			return serviceDeployedValidator.Validate(context.Background(), kc)
-		}).WithTimeout(30 * time.Minute).WithPolling(10 * time.Second).Should(Succeed())
+		}).WithTimeout(10 * time.Minute).WithPolling(10 * time.Second).Should(Succeed())
 
 		templateBy(clusterdeployment.TemplateAWSHostedCP, "installing controller and templates on standalone cluster")