Skip to content
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.

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

🌱 Use kind as a secondary management cluster for clusterctl E2E tests #10639

Merged

Conversation

fabriziopandini
Copy link
Member

What this PR does / why we need it:
This PR allow clusterctl E2E tests to use kind as a secondary management cluster (instead of using expensive infrastructure resources)

Which issue(s) this PR fixes:
Fixes #7613

/area testing

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. area/testing Issues or PRs related to testing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 17, 2024
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 17, 2024
@fabriziopandini fabriziopandini changed the title [WIP] Use kind as a secondary management cluster for clusterctl E2E tests [WIP] 🌱 Use kind as a secondary management cluster for clusterctl E2E tests May 17, 2024
@kubernetes-sigs kubernetes-sigs deleted a comment from k8s-ci-robot May 17, 2024
@fabriziopandini
Copy link
Member Author

Check if there are regressions
/test pull-cluster-api-e2e-main

@fabriziopandini fabriziopandini added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label May 17, 2024
@fabriziopandini fabriziopandini changed the title [WIP] 🌱 Use kind as a secondary management cluster for clusterctl E2E tests 🌱 Use kind as a secondary management cluster for clusterctl E2E tests May 17, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 17, 2024
@fabriziopandini
Copy link
Member Author

/test pull-cluster-api-e2e-main

@fabriziopandini
Copy link
Member Author

one more run
/test pull-cluster-api-e2e-main

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 17, 2024
@k8s-ci-robot
Copy link
Contributor

PR needs rebase.

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-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 20, 2024
@chrischdi
Copy link
Member

/test help

@k8s-ci-robot
Copy link
Contributor

@chrischdi: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test pull-cluster-api-build-main
  • /test pull-cluster-api-e2e-blocking-main
  • /test pull-cluster-api-e2e-conformance-ci-latest-main
  • /test pull-cluster-api-e2e-conformance-main
  • /test pull-cluster-api-e2e-main
  • /test pull-cluster-api-e2e-mink8s-main
  • /test pull-cluster-api-e2e-upgrade-1-30-1-31-main
  • /test pull-cluster-api-test-main
  • /test pull-cluster-api-test-mink8s-main
  • /test pull-cluster-api-verify-main

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-apidiff-main

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-apidiff-main
  • pull-cluster-api-build-main
  • pull-cluster-api-e2e-blocking-main
  • pull-cluster-api-test-main
  • pull-cluster-api-verify-main

In response to this:

/test help

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-sigs/prow repository.

@chrischdi
Copy link
Member

/test pull-cluster-api-e2e-main

To run the tests and for me to compare the artifacts

Copy link
Member

@chrischdi chrischdi left a comment

Choose a reason for hiding this comment

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

All in all a great improvement.

Waiting to compare the output artifacts though :-)

test/e2e/clusterctl_upgrade.go Outdated Show resolved Hide resolved
@fabriziopandini
Copy link
Member Author

Waiting to compare the output artifacts though :-)

Here you can find logs from a management cluster using real infrastructure: https://gcsweb.k8s.io/gcs/kubernetes-jenkins/logs/periodic-cluster-api-e2e-main/1792914324948258816/artifacts/clusters/clusterctl-upgrade-2r960q/

Here you can find logs from a management cluster using kind: https://gcsweb.k8s.io/gcs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/10639/pull-cluster-api-e2e-main/1791517726108291072/artifacts/clusters/clusterctl-upgrade-management-31y0ec/

We have logs from controllers, CAPI resources metrics
We don't have logs from machines, (not sure about the infrastructure and the machine pools one)

Also, when using kind, you wont find a namespace for this test in the bootsrap cluster

@chrischdi
Copy link
Member

/lgtm

The ones I wanted to look for were e.g. these: https://gcsweb.k8s.io/gcs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/10639/pull-cluster-api-e2e-main/1792889525148585984/artifacts/clusters/clusterctl-upgrade-management-95kq15/resources/clusterctl-upgrade/Cluster/

looks great! Thanks

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 21, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: ec87a11899ff41234fb825ad72938bc64d850c8c

@sbueringer
Copy link
Member

/test pull-cluster-api-e2e-main

Copy link
Member

@sbueringer sbueringer left a comment

Choose a reason for hiding this comment

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

Very nice!

test/e2e/clusterctl_upgrade.go Outdated Show resolved Hide resolved
test/e2e/clusterctl_upgrade.go Outdated Show resolved Hide resolved
test/e2e/clusterctl_upgrade.go Outdated Show resolved Hide resolved
test/e2e/clusterctl_upgrade.go Show resolved Hide resolved
test/e2e/clusterctl_upgrade.go Show resolved Hide resolved
test/e2e/clusterctl_upgrade.go Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 23, 2024
@sbueringer
Copy link
Member

/cherry-pick release-1.7

@k8s-infra-cherrypick-robot

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.7 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.7

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-sigs/prow repository.

@sbueringer
Copy link
Member

Thx!

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 23, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 383d0dc38d427f662ced736ca76c3ca68c25f76a

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 23, 2024
@k8s-ci-robot k8s-ci-robot merged commit 7464233 into kubernetes-sigs:main May 23, 2024
20 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.8 milestone May 23, 2024
@k8s-infra-cherrypick-robot

@sbueringer: #10639 failed to apply on top of branch "release-1.7":

Applying: Use kind as a secondary management cluster for clusterctl E2E tests
.git/rebase-apply/patch:16: trailing whitespace.
	
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	test/e2e/clusterctl_upgrade.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/clusterctl_upgrade.go
CONFLICT (content): Merge conflict in test/e2e/clusterctl_upgrade.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use kind as a secondary management cluster for clusterctl E2E tests
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.7

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-sigs/prow repository.

fabriziopandini added a commit to fabriziopandini/cluster-api that referenced this pull request May 24, 2024
…kubernetes-sigs#10639)

* Use kind as a secondary management cluster for clusterctl E2E tests

* Use kind in all clusterctl tests

* Fix lint

* Address comments
fabriziopandini added a commit to fabriziopandini/cluster-api that referenced this pull request May 24, 2024
…kubernetes-sigs#10639)

* Use kind as a secondary management cluster for clusterctl E2E tests

* Use kind in all clusterctl tests

* Fix lint

* Address comments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/testing Issues or PRs related to testing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Framework: Kind cluster as secondary management cluster?
5 participants