Skip to content

test: Connecting Work-api to fleet join/leave #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanzhang-oss merged 5 commits into from
Sep 16, 2022
Merged

test: Connecting Work-api to fleet join/leave #294

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c32fd35
Initial Commit
aagusuab Sep 15, 2022
f28d4c1
having join/leave for work-api e2e
aagusuab Sep 15, 2022
5b558f8
litn fix
aagusuab Sep 15, 2022
e982d9c
litn fix
aagusuab Sep 15, 2022
7bfac60
Removed imc-related variable from the work-api-e2e-test.
aagusuab Sep 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion test/e2e/work_api_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ import (
"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"
)

// 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"
Expand All @@ -29,6 +30,9 @@ var _ = XDescribe("Work API Controller test", func() {
var (
ctx context.Context

// These variables are used to join the member cluster.
mc *v1alpha1.MemberCluster

// Includes all works applied to the hub cluster. Used for garbage collection.
works []workapi.Work

Expand All @@ -51,12 +55,22 @@ var _ = XDescribe("Work API Controller test", func() {
resourceNamespace = testutils.NewNamespace(resourceNamespaceName)
testutils.CreateNamespace(*MemberCluster, resourceNamespace)

// Member Cluster must join the fleet for Work API to work.
Copy link
Contributor

@zhiying-lin zhiying-lin Sep 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

discussed with @ryanzhang-oss.

Let's make sure join member cluster in BeforeSuite and delete it in AfterSuite.

As the result, please remove join_leave_member_test.go as join/leave has been covered in the Before/After Suite.

cc @Arvindthiru

By("deploy member cluster in the hub cluster")
mc = testutils.NewMemberCluster(MemberCluster.ClusterName, 60, v1alpha1.ClusterStateJoin)
testutils.CreateMemberCluster(*HubCluster, mc)

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() {
testutils.DeleteWork(ctx, *HubCluster, works)
testutils.DeleteMemberCluster(ctx, *HubCluster, mc)

testutils.DeleteNamespace(*MemberCluster, resourceNamespace)
})

Expand Down