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.

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

Jump to bottom

🌱 Add MachinePools to topology upgrade test #9502

Merged
merged 1 commit into from
Sep 28, 2023
Merged

🌱 Add MachinePools to topology upgrade test #9502

merged 1 commit into from
Sep 28, 2023

Conversation

willie-yao
Copy link
Contributor

What this PR does / why we need it:
This PR adds checks for MachinePools in the cluster topology upgrade test. Template flavors upgrade, topology, and kcp-scale-in already contain MachinePools using the cluster-with-topology.yaml base.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes part of #5991

/area testing

@k8s-ci-robot k8s-ci-robot added area/testing Issues or PRs related to testing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 26, 2023
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 26, 2023
@willie-yao
Copy link
Contributor Author

/test ls

@k8s-ci-robot
Copy link
Contributor

@willie-yao: 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-full-dualstack-and-ipv6-main
  • /test pull-cluster-api-e2e-full-main
  • /test pull-cluster-api-e2e-main
  • /test pull-cluster-api-e2e-mink8s-main
  • /test pull-cluster-api-e2e-workload-upgrade-1-28-latest-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
  • /test pull-cluster-api-e2e-scale-main-experimental

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-main
  • pull-cluster-api-test-main
  • pull-cluster-api-verify-main

In response to this:

/test ls

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.

@willie-yao
Copy link
Contributor Author

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-28-latest-main

killianmuldoon
killianmuldoon reviewed Sep 27, 2023
View reviewed changes
test/framework/cluster_topology_helpers.go Outdated
WaitForKubeProxyUpgrade []interface{}
WaitForDNSUpgrade []interface{}
WaitForEtcdUpgrade []interface{}
PreWaitForControlPlaneToBeUpgraded func()
PreWaitForMachineDeploymentToBeUpgraded func()
PreWaitForMachinePoolToBeUpgraded func()
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need to add this for something in particular? If not I would instead rename preWaitForMachinePoolToBeUpgraded to preWaitForWorkersToBeUpgraded

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 27, 2023
@willie-yao
Copy link
Contributor Author

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-28-latest-main

1 similar comment
@willie-yao
Copy link
Contributor Author

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-28-latest-main

@willie-yao
Copy link
Contributor Author

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-28-latest-main

@willie-yao
Copy link
Contributor Author

/retest

@willie-yao willie-yao changed the title 🌱 WIP: Add MachinePools to topology upgrade test 🌱 Add MachinePools to topology upgrade test Sep 27, 2023
@killianmuldoon
Copy link
Contributor

Looking good now - I'll do a full review later today.

Could you squash the commits when you get a chance?

chrischdi
chrischdi reviewed Sep 28, 2023
View reviewed changes
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.

/lgtm

pending squash

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

LGTM label has been added.

Git tree hash: 81599e88414d917387e9ea756f3a2413d34095dd

@killianmuldoon
Copy link
Contributor

Looks good!
/lgtm

/hold
For squash.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 28, 2023
@willie-yao
Copy link
Contributor Author

Thank you @killianmuldoon @chrischdi! Is one of you able to update the #5991's issue description with this PR?

@killianmuldoon killianmuldoon mentioned this pull request Sep 28, 2023
Closed
39 tasks
@killianmuldoon
Copy link
Contributor

/hold cancel
/approve

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 28, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: killianmuldoon

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 Sep 28, 2023
@killianmuldoon
Copy link
Contributor

Thank you @killianmuldoon @chrischdi! Is one of you able to update the #5991 issue description with this PR?

Please check if I've done this the way you expect

@k8s-ci-robot k8s-ci-robot merged commit 3b67cb7 into kubernetes-sigs:main Sep 28, 2023
11 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.6 milestone Sep 28, 2023
@willie-yao
Copy link
Contributor Author

Please check if I've done this the way you expect

Looks good! Small nit would you be able to tag me after the issue? Just so it matches the rest of the items on the list.

@hzxuzhonghu hzxuzhonghu mentioned this pull request Nov 23, 2023
Closed
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@killianmuldoon killianmuldoon killianmuldoon left review comments

@chrischdi chrischdi chrischdi left review comments

@elmiko elmiko Awaiting requested review from elmiko

@JoelSpeed JoelSpeed Awaiting requested review from JoelSpeed

Assignees

@chrischdi chrischdi

@killianmuldoon killianmuldoon

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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.6
Development

Successfully merging this pull request may close these issues.
4 participants
@willie-yao @k8s-ci-robot @killianmuldoon @chrischdi