Add support for kwok cluster simulator #239

reetasingh · 2023-04-16T06:52:30Z

Fixes #214

Adding support for creation and deletion of kwok cluster which includes installing kwokctl
Adding env function for creation and deletion of kwok cluster
Adding example

k8s-ci-robot · 2023-04-16T06:52:40Z

Hi @reetasingh. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

harshanarayana · 2023-04-17T06:58:14Z

pkg/envfuncs/kwok_funcs.go

+type kwokContextKey string
+
+// GetKwokClusterFromContext helps extract the kwok.Cluster object from the context.
+func GetKwokClusterFromContext(ctx context.Context, clusterName string) (*kwok.Cluster, bool) {


Since this and kind_funcs.go share more of less the same set of features/workflows, I am wondering if we can really simplify this better ? It might lead to an interface change but, that might not be a bad idea considering we are still in early phases.

Create a interface type that indicates the cluster providers that can be used to implement kwok/kind or any other one in the future

This env funcs use the interface type with certain args so that these things don't need to be changed frequently

cc @vladimirvivien @reetasingh Does this make sense ?

type clusterOpts func(c ClusterProvider) type ClusterProvider interface { WithVersion(version string) ClusterProvider WithOpts(opts ...clusterOpts) ClusterProvider Create(args ...string) (string, error) GetKubeConfig() string GetKubectlContext() string ExportLogs(dest string) error Destroy() error LoadDockerImages(image string) error LoadImageArchive(archivePath string) error }

Define an interface like above and make the ClusterProvider as an argument to functions in the envfuncs helper so that we can build a reusable set of envfunc ?

@harshanarayana I like this refactor a lot. First impression is that it is doable and makes sense. Let's spend some times discussing to make sure we're not trapping future development work into a corner by being too specific.

+1 I agree. And I think we should do that as a pre-work before we can get this one in and not really use this PR to do that change. What do you think ?

@harshanarayana do you plan to address the comments in your PR #239 soon? I am thinking when do we plan to proceed and close this one out?

harshanarayana · 2023-04-17T18:43:17Z

Thanks a lot for the wonderful work @reetasingh

support/kwok/kwok.go

pkg/envfuncs/kwok_funcs.go

support/kwok/kwok.go

examples/kwok/kwok_test.go

support/kwok/kwok.go

Huang-Wei · 2023-04-26T17:51:47Z

support/kwok/kwok.go

+		return k.getKubeconfig()
+	}
+
+	command := fmt.Sprintf(`kwokctl create cluster --name %s`, k.name)


by default, this would spin up a k8s cluster using docker-compose, if we want to default it to kind, need to pass-in --runtime kind explicitly.

@Huang-Wei would --runtime kind require kind to be installed too? thinking if we need to add kind dependency as well when installing kwok

@wzshiming kwokctl wouldn't install the missing runtime binary, right?

@Huang-Wei @wzshiming do we want to default it to kind? or we can let users pass config file to CreateWithConfig(kwokConfigFile string) where file has entry for runtime: kind

I'm fine with defaulting the same default runtime (docker) in kwokctl here; unless e2e-framework is keen on defaulting to kind.

My suggestion: since e2e-framework already has support for kind clusters, let's default to kind. If someone wants to use docker-compose, they can do so using the kwok config file.

Hi @vladimirvivien since kwokctl defaults to using docker-compose I think it makes more sense to default to docker-compose. if we default to kind with --runtime kind argument we will not be able to override to docker-compose since --runtime kind takes precendence over kwok config file

examples/kwok/main_test.go

Huang-Wei · 2023-04-26T18:05:56Z

/ok-to-test

reetasingh · 2023-04-27T04:06:10Z

/retest-required

examples/kwok/kwok_with_config/kwok_test.go

vladimirvivien · 2023-06-17T16:08:59Z

Will this PR use #246?

harshanarayana · 2023-06-18T16:18:49Z

Will this PR use #246?

@vladimirvivien unless this is really really urgent to get into the framework right now, can we wait a few more days until we finalize #246 and get this in using that same interface ? But if getting this in is critical, I can understand 😄

vladimirvivien · 2023-06-18T18:51:26Z

@harshanarayana I was asking because I do want it to wait to use #246.

Thanks

harshanarayana · 2023-06-18T18:53:47Z

I'm all right with that.. Let us get this in if this is ready .. I can take care of refactoring this one. @vladimirvivien

examples/kwok/kwok_with_config/kwok_test.go

harshanarayana · 2023-06-18T20:22:16Z

@vladimirvivien FYI, I ported this kwok work into #246 already just now.

reetasingh · 2023-06-21T20:37:39Z

@vladimirvivien FYI, I ported this kwok work into #246 already just now.

Hi @harshanarayana @vladimirvivien I was looking forward to merging my PR in this repo. it means a lot to a new contributor like me. I can make the changes required to update to meet the interface definiton. @harshanarayana is it ok with you that I continue to work on this PR instead and get it merged after the interface defintion PR is merged?

harshanarayana · 2023-06-22T02:07:49Z

@reetasingh sorry for any confusion that message might have caused. Migration done to other PR is only to show it is movable there easily.. And that was done so that this PR can be merged even before #246 finishes.. I think #246 PR isn't ready yet to be merged.. Like I mentioned above if this PR is all done and @vladimirvivien is okay with the changes on this current PR, and there isn't any more pending changes, let us definitely get this merged first

reetasingh · 2023-06-23T04:17:14Z

@reetasingh sorry for any confusion that message might have caused. Migration done to other PR is only to show it is movable there easily.. And that was done so that this PR can be merged even before #246 finishes.. I think #246 PR isn't ready yet to be merged.. Like I mentioned above if this PR is all done and @vladimirvivien is okay with the changes on this current PR, and there isn't any more pending changes, let us definitely get this merged first

thanks @harshanarayana . yes this PR is all done . @vladimirvivien please take a look. I have addressed all open review comments.

support/kwok/kwok.go

vladimirvivien · 2023-07-01T14:01:38Z

@reetasingh and @harshanarayana
Apologies for rehashing this, but if I understand, we can merge this PR as is. Then later we'll open a new PR once #246 is merged ?

harshanarayana · 2023-07-02T18:43:10Z

@vladimirvivien Yes. Let us get this one merged if you dont have any pending review to be addressed. We can take care of refactoring and fitting this into the other interface later on in a different PR or I can take care of that in my already open PR.

vladimirvivien · 2023-07-02T21:07:47Z

/lgtm
/approve

k8s-ci-robot · 2023-07-02T21:07:55Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: reetasingh, vladimirvivien

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [vladimirvivien]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Add support for kwok cluster simulator

5a6be4e

k8s-ci-robot requested a review from harshanarayana April 16, 2023 06:52

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Apr 16, 2023

k8s-ci-robot requested a review from vladimirvivien April 16, 2023 06:52

k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Apr 16, 2023

k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Apr 16, 2023

reetasingh mentioned this pull request Apr 16, 2023

Support for using Kubernetes-SIGs Kwok cluster simulator #214

Closed

harshanarayana reviewed Apr 17, 2023

View reviewed changes

harshanarayana mentioned this pull request Apr 17, 2023

Enhancement: Define Cluster Provider Interfaces for ease of extension #245

Closed

jbpratt reviewed Apr 18, 2023

View reviewed changes

support/kwok/kwok.go Outdated Show resolved Hide resolved

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Apr 21, 2023

use go install to install kwok and kwokctl

8c89030

reetasingh force-pushed the reetas_kwok_feature_support branch from dca8922 to 8c89030 Compare April 21, 2023 05:06

wzshiming reviewed Apr 21, 2023

View reviewed changes

support/kwok/kwok.go Outdated Show resolved Hide resolved

wzshiming reviewed Apr 21, 2023

View reviewed changes

pkg/envfuncs/kwok_funcs.go Outdated Show resolved Hide resolved

wzshiming reviewed Apr 21, 2023

View reviewed changes

support/kwok/kwok.go Outdated Show resolved Hide resolved

support/kwok/kwok.go Outdated Show resolved Hide resolved

support/kwok/kwok.go Outdated Show resolved Hide resolved

wzshiming reviewed Apr 21, 2023

View reviewed changes

examples/kwok/kwok_test.go Outdated Show resolved Hide resolved

remove kwok binary installation steps

94e4e83

Huang-Wei reviewed Apr 26, 2023

View reviewed changes

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 26, 2023

create node and verify pod status in example test for kwok

4c3a112

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 27, 2023

jbpratt mentioned this pull request May 30, 2023

Cluster provider for K3D #264

Closed

reetasingh added 3 commits June 5, 2023 23:39

refactor tests

a3e23d0

pass --wait argument to create cluster

7607037

change wait duration default

80c77ce

harshanarayana reviewed Jun 12, 2023

View reviewed changes

examples/kwok/kwok_with_config/kwok_test.go Outdated Show resolved Hide resolved

examples/kwok/kwok_with_config/kwok_test.go Outdated Show resolved Hide resolved

remove sleep and use wait.For

a75ec03

harshanarayana reviewed Jun 18, 2023

View reviewed changes

examples/kwok/kwok_with_config/kwok_test.go Outdated Show resolved Hide resolved

reetasingh added 3 commits June 22, 2023 19:57

remove check for dep is not nil

e43c58a

update kwok file

201c4f4

gofumpt main_test

2904a6e

wzshiming reviewed Jun 23, 2023

View reviewed changes

support/kwok/kwok.go Outdated Show resolved Hide resolved

jbpratt mentioned this pull request Jun 23, 2023

cluster provider interface definition #246

Merged

update kwok version

a3234c7

k8s-ci-robot assigned vladimirvivien Jul 2, 2023

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 2, 2023

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 2, 2023

k8s-ci-robot merged commit 841b3d1 into kubernetes-sigs:main Jul 2, 2023

harshanarayana mentioned this pull request Aug 14, 2023

Release Ticket: v0.3.0 of e2e-framework #307

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for kwok cluster simulator #239

Add support for kwok cluster simulator #239

reetasingh commented Apr 16, 2023 •

edited

Loading

k8s-ci-robot commented Apr 16, 2023

harshanarayana Apr 17, 2023

vladimirvivien Apr 17, 2023

harshanarayana Apr 17, 2023

harshanarayana Apr 17, 2023

reetasingh May 17, 2023

harshanarayana commented Apr 17, 2023

Huang-Wei Apr 26, 2023

reetasingh Apr 27, 2023 •

edited

Loading

Huang-Wei Apr 27, 2023

reetasingh Apr 27, 2023 •

edited

Loading

Huang-Wei Apr 27, 2023

vladimirvivien May 5, 2023

reetasingh Jun 6, 2023 •

edited

Loading

Huang-Wei commented Apr 26, 2023

reetasingh commented Apr 27, 2023

vladimirvivien commented Jun 17, 2023

harshanarayana commented Jun 18, 2023

vladimirvivien commented Jun 18, 2023

harshanarayana commented Jun 18, 2023 •

edited

Loading

harshanarayana commented Jun 18, 2023

reetasingh commented Jun 21, 2023 •

edited

Loading

harshanarayana commented Jun 22, 2023 •

edited

Loading

reetasingh commented Jun 23, 2023

vladimirvivien commented Jul 1, 2023

harshanarayana commented Jul 2, 2023

vladimirvivien commented Jul 2, 2023

k8s-ci-robot commented Jul 2, 2023

Add support for kwok cluster simulator #239

Add support for kwok cluster simulator #239

Conversation

reetasingh commented Apr 16, 2023 • edited Loading

k8s-ci-robot commented Apr 16, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

harshanarayana commented Apr 17, 2023

Choose a reason for hiding this comment

reetasingh Apr 27, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

reetasingh Apr 27, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

reetasingh Jun 6, 2023 • edited Loading

Choose a reason for hiding this comment

Huang-Wei commented Apr 26, 2023

reetasingh commented Apr 27, 2023

vladimirvivien commented Jun 17, 2023

harshanarayana commented Jun 18, 2023

vladimirvivien commented Jun 18, 2023

harshanarayana commented Jun 18, 2023 • edited Loading

harshanarayana commented Jun 18, 2023

reetasingh commented Jun 21, 2023 • edited Loading

harshanarayana commented Jun 22, 2023 • edited Loading

reetasingh commented Jun 23, 2023

vladimirvivien commented Jul 1, 2023

harshanarayana commented Jul 2, 2023

vladimirvivien commented Jul 2, 2023

k8s-ci-robot commented Jul 2, 2023

reetasingh commented Apr 16, 2023 •

edited

Loading

reetasingh Apr 27, 2023 •

edited

Loading

reetasingh Apr 27, 2023 •

edited

Loading

reetasingh Jun 6, 2023 •

edited

Loading

harshanarayana commented Jun 18, 2023 •

edited

Loading

reetasingh commented Jun 21, 2023 •

edited

Loading

harshanarayana commented Jun 22, 2023 •

edited

Loading