Skip to content

Commit a6d0e64

Browse files
committed
add log to debug e2e failure
1 parent 7591059 commit a6d0e64

1 file changed

Lines changed: 12 additions & 2 deletions

File tree

test/e2e/utils_test.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,16 @@ func createWorkResource(name, namespace string) {
668668
// createWorkResources creates some resources on the hub cluster for testing purposes.
669669
func createWorkResources() {
670670
ns := appNamespace()
671-
Expect(hubClient.Create(ctx, &ns)).To(Succeed(), "Failed to create namespace %s", ns.Namespace)
671+
By(fmt.Sprintf("Creating namespace %s", ns.Name))
672+
err := hubClient.Create(ctx, &ns)
673+
if k8serrors.IsAlreadyExists(err) {
674+
if getErr := hubClient.Get(ctx, types.NamespacedName{Name: ns.Name}, &ns); getErr != nil {
675+
Expect(err).To(BeNil(), "Failed to create namespace %s as it already exists, isDeleting: %v", ns.Name, ns.DeletionTimestamp)
676+
} else {
677+
Expect(err).To(BeNil(), "Failed to create namespace %s as it already exists, failed to get ns: %v", ns.Name, getErr)
678+
}
679+
}
680+
Expect(err).To(BeNil(), "Failed to create namespace %s", ns.Name)
672681

673682
configMap := appConfigMap()
674683
Expect(hubClient.Create(ctx, &configMap)).To(Succeed(), "Failed to create config map %s", configMap.Name)
@@ -681,8 +690,9 @@ func cleanupWorkResources() {
681690

682691
func cleanWorkResourcesOnCluster(cluster *framework.Cluster) {
683692
ns := appNamespace()
684-
Expect(client.IgnoreNotFound(cluster.KubeClient.Delete(ctx, &ns))).To(Succeed(), "Failed to delete namespace %s", ns.Namespace)
693+
Expect(client.IgnoreNotFound(cluster.KubeClient.Delete(ctx, &ns))).To(Succeed(), "Failed to delete namespace %s", ns.Name)
685694

695+
By(fmt.Sprintf("verifying work namespace %s is deleted completely", ns.Name))
686696
workResourcesRemovedActual := workNamespaceRemovedFromClusterActual(cluster)
687697
Eventually(workResourcesRemovedActual, workloadEventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to remove work resources from %s cluster", cluster.ClusterName)
688698
}

0 commit comments

Comments
 (0)