From c32fd359b0fa5955efd99089a15a29e92955a96a Mon Sep 17 00:00:00 2001 From: Youn Jae Kim Date: Thu, 15 Sep 2022 12:59:03 -0700 Subject: [PATCH 1/5] Initial Commit --- test/e2e/work_api_e2e_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/work_api_e2e_test.go b/test/e2e/work_api_e2e_test.go index a1c03a811..7dea99eeb 100644 --- a/test/e2e/work_api_e2e_test.go +++ b/test/e2e/work_api_e2e_test.go @@ -19,7 +19,7 @@ import ( ) // TODO: enable this when join/leave logic is connected to work-api, join the Hub and Member for this test. -var _ = XDescribe("Work API Controller test", func() { +var _ = Describe("Work API Controller test", func() { const ( conditionTypeApplied = "Applied" From f28d4c1409d758b8f37666cd9a84cc9b7831819b Mon Sep 17 00:00:00 2001 From: Youn Jae Kim Date: Thu, 15 Sep 2022 15:54:35 -0700 Subject: [PATCH 2/5] having join/leave for work-api e2e --- test/e2e/work_api_e2e_test.go | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/test/e2e/work_api_e2e_test.go b/test/e2e/work_api_e2e_test.go index 7dea99eeb..440761e4e 100644 --- a/test/e2e/work_api_e2e_test.go +++ b/test/e2e/work_api_e2e_test.go @@ -3,11 +3,11 @@ package e2e import ( "context" "fmt" - "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.goms.io/fleet/apis/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -29,6 +29,10 @@ var _ = Describe("Work API Controller test", func() { var ( ctx context.Context + // These variables are used to join the member cluster. + mc *v1alpha1.MemberCluster + imc *v1alpha1.InternalMemberCluster + // Includes all works applied to the hub cluster. Used for garbage collection. works []workapi.Work @@ -51,11 +55,27 @@ var _ = Describe("Work API Controller test", func() { resourceNamespace = testutils.NewNamespace(resourceNamespaceName) testutils.CreateNamespace(*MemberCluster, resourceNamespace) + // Member Cluster must join the fleet for Work API to work. + By("deploy member cluster in the hub cluster") + mc = testutils.NewMemberCluster(MemberCluster.ClusterName, 60, v1alpha1.ClusterStateJoin) + testutils.CreateMemberCluster(*HubCluster, mc) + + By("check if internal member cluster created in the hub cluster") + imc = testutils.NewInternalMemberCluster(MemberCluster.ClusterName, memberNamespace.Name) + testutils.WaitInternalMemberCluster(*HubCluster, imc) + + By("check if internal member cluster condition is updated to Joined") + testutils.WaitConditionInternalMemberCluster(*HubCluster, imc, v1alpha1.AgentJoined, metav1.ConditionTrue, testutils.PollTimeout) + By("check if member cluster condition is updated to Joined") + testutils.WaitConditionMemberCluster(*HubCluster, mc, v1alpha1.ConditionTypeMemberClusterJoined, metav1.ConditionTrue, testutils.PollTimeout) + //Empties the works since they were garbage collected earlier. works = []workapi.Work{} }) AfterEach(func() { + By("delete the member cluster") + testutils.DeleteMemberCluster(ctx, *HubCluster, mc) testutils.DeleteWork(ctx, *HubCluster, works) testutils.DeleteNamespace(*MemberCluster, resourceNamespace) }) From 5b558f8afb2db3f8770814791c09e7e0654258ff Mon Sep 17 00:00:00 2001 From: Youn Jae Kim Date: Thu, 15 Sep 2022 16:08:38 -0700 Subject: [PATCH 3/5] litn fix --- test/e2e/work_api_e2e_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/test/e2e/work_api_e2e_test.go b/test/e2e/work_api_e2e_test.go index 440761e4e..5e1195f73 100644 --- a/test/e2e/work_api_e2e_test.go +++ b/test/e2e/work_api_e2e_test.go @@ -3,6 +3,7 @@ package e2e import ( "context" "fmt" + "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" . "github.com/onsi/ginkgo/v2" From e982d9c0009df420e92ad636856b36ed0500f77b Mon Sep 17 00:00:00 2001 From: Youn Jae Kim Date: Thu, 15 Sep 2022 16:55:04 -0700 Subject: [PATCH 4/5] litn fix --- test/e2e/work_api_e2e_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/e2e/work_api_e2e_test.go b/test/e2e/work_api_e2e_test.go index 5e1195f73..ac40421fd 100644 --- a/test/e2e/work_api_e2e_test.go +++ b/test/e2e/work_api_e2e_test.go @@ -8,13 +8,13 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "go.goms.io/fleet/apis/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" workapi "sigs.k8s.io/work-api/pkg/apis/v1alpha1" + "go.goms.io/fleet/apis/v1alpha1" "go.goms.io/fleet/pkg/utils" testutils "go.goms.io/fleet/test/e2e/utils" ) @@ -67,6 +67,7 @@ var _ = Describe("Work API Controller test", func() { By("check if internal member cluster condition is updated to Joined") testutils.WaitConditionInternalMemberCluster(*HubCluster, imc, v1alpha1.AgentJoined, metav1.ConditionTrue, testutils.PollTimeout) + By("check if member cluster condition is updated to Joined") testutils.WaitConditionMemberCluster(*HubCluster, mc, v1alpha1.ConditionTypeMemberClusterJoined, metav1.ConditionTrue, testutils.PollTimeout) @@ -75,9 +76,9 @@ var _ = Describe("Work API Controller test", func() { }) AfterEach(func() { - By("delete the member cluster") - testutils.DeleteMemberCluster(ctx, *HubCluster, mc) testutils.DeleteWork(ctx, *HubCluster, works) + testutils.DeleteMemberCluster(ctx, *HubCluster, mc) + testutils.DeleteNamespace(*MemberCluster, resourceNamespace) }) From 7bfac60443c7f53d61b2d83c937756adf13fb50a Mon Sep 17 00:00:00 2001 From: Youn Jae Kim Date: Thu, 15 Sep 2022 18:14:58 -0700 Subject: [PATCH 5/5] Removed imc-related variable from the work-api-e2e-test. --- test/e2e/work_api_e2e_test.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/test/e2e/work_api_e2e_test.go b/test/e2e/work_api_e2e_test.go index ac40421fd..cbcbfa1ff 100644 --- a/test/e2e/work_api_e2e_test.go +++ b/test/e2e/work_api_e2e_test.go @@ -31,8 +31,7 @@ var _ = Describe("Work API Controller test", func() { ctx context.Context // These variables are used to join the member cluster. - mc *v1alpha1.MemberCluster - imc *v1alpha1.InternalMemberCluster + mc *v1alpha1.MemberCluster // Includes all works applied to the hub cluster. Used for garbage collection. works []workapi.Work @@ -61,13 +60,6 @@ var _ = Describe("Work API Controller test", func() { mc = testutils.NewMemberCluster(MemberCluster.ClusterName, 60, v1alpha1.ClusterStateJoin) testutils.CreateMemberCluster(*HubCluster, mc) - By("check if internal member cluster created in the hub cluster") - imc = testutils.NewInternalMemberCluster(MemberCluster.ClusterName, memberNamespace.Name) - testutils.WaitInternalMemberCluster(*HubCluster, imc) - - By("check if internal member cluster condition is updated to Joined") - testutils.WaitConditionInternalMemberCluster(*HubCluster, imc, v1alpha1.AgentJoined, metav1.ConditionTrue, testutils.PollTimeout) - By("check if member cluster condition is updated to Joined") testutils.WaitConditionMemberCluster(*HubCluster, mc, v1alpha1.ConditionTypeMemberClusterJoined, metav1.ConditionTrue, testutils.PollTimeout)