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 Runtime SDK and Rollout tests #9703

Merged
merged 1 commit into from
Nov 14, 2023
Merged

🌱 Add MachinePools to Runtime SDK and Rollout tests #9703

merged 1 commit into from
Nov 14, 2023

Conversation

willie-yao
Copy link
Contributor

What this PR does / why we need it:
This PR adds MachinePools to runtime SDK and rollout tests for ClusterClass. This will help unblock MachinePoolMachines which is affected by these tests not accounting for MachinePools in the quickstart spec. #8842

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 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 Nov 10, 2023
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 10, 2023
@willie-yao
Copy link
Contributor Author

/test pull-cluster-api-e2e-full-main

@willie-yao willie-yao changed the title [WIP] Add MachinePools to Runtime SDK and Rollout tests 🌱 [WIP] Add MachinePools to Runtime SDK and Rollout tests Nov 10, 2023
@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 Nov 10, 2023
@killianmuldoon
Copy link
Contributor

/test pull-cluster-api-e2e-full-main

@willie-yao
Copy link
Contributor Author

/retest

@willie-yao
Copy link
Contributor Author

/test pull-cluster-api-e2e-full-main

@fabriziopandini
Copy link
Member

Some tests are failing
(Note: I'm not sure if test failures are related to this change, but this should be investigated before reviewing this PR;
triggering re-run to rule out flakes)
/test pull-cluster-api-e2e-full-main

@willie-yao
Copy link
Contributor Author

/test pull-cluster-api-e2e-full-main

@willie-yao
Copy link
Contributor Author

@fabriziopandini We noticed a bug in how we check if the bootstrap config field is set as MachinePools contain a bootstrap config and not a template, but the parameter ModifyBootstrapConfigTemplateFields was used both to set the bootstrap config and check. The latest change should fix this

@willie-yao
Copy link
Contributor Author

/retest

@willie-yao willie-yao changed the title 🌱 [WIP] Add MachinePools to Runtime SDK and Rollout tests 🌱 Add MachinePools to Runtime SDK and Rollout tests Nov 13, 2023
Jont828
Jont828 approved these changes Nov 13, 2023
View reviewed changes
Copy link
Contributor

@Jont828 Jont828 left a comment

Choose a reason for hiding this comment

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

/lgtm

Nice one! This should unblock the MachinePool Machines PR as well.

test/e2e/cluster_upgrade_runtimesdk.go
@@ -247,18 +247,6 @@ func clusterUpgradeWithRuntimeSDKSpec(ctx context.Context, inputGetter func() cl
},
})

// Only attempt to upgrade MachinePools if they were provided in the template.
if len(clusterResources.MachinePools) > 0 && workerMachineCount > 0 {
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice cleanup!

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

LGTM label has been added.

Git tree hash: 00eca5ab45918fa32db3e615bdfd1308d69a3d19

@CecileRobertMichon
Copy link
Contributor

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon

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 Nov 13, 2023
@k8s-ci-robot k8s-ci-robot merged commit b04dbbd into kubernetes-sigs:main Nov 14, 2023
17 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.6 milestone Nov 14, 2023
sbueringer
sbueringer reviewed Nov 14, 2023
View reviewed changes
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.

Nice catch on the upgrade / self-hosted / Runtime SDK tests.

I think we need a follow-up PR to make the new coverage fully functional

test/e2e/clusterclass_changes.go Show resolved Hide resolved
test/e2e/clusterclass_changes.go Show resolved Hide resolved
test/e2e/clusterclass_rollout.go Show resolved Hide resolved
test/e2e/clusterclass_rollout.go Show resolved Hide resolved
test/e2e/clusterclass_rollout.go Show resolved Hide resolved
test/e2e/clusterclass_rollout.go Show resolved Hide resolved
test/e2e/clusterclass_rollout.go Show resolved Hide resolved
sbueringer
sbueringer reviewed Nov 14, 2023
View reviewed changes
test/e2e/clusterclass_rollout.go Show resolved Hide resolved
test/e2e/clusterclass_rollout.go Show resolved Hide resolved
test/e2e/clusterclass_rollout.go Show resolved Hide resolved
test/e2e/clusterclass_rollout.go Show resolved Hide resolved
@willie-yao
Copy link
Contributor Author

I think we need a follow-up PR to make the new coverage fully functional

Got it, will make a separate PR ASAP to incorporate these changes. Thanks for the suggestions!

@willie-yao willie-yao mentioned this pull request Nov 14, 2023
Merged
@sbueringer
Copy link
Member

Thank you :) Top of my list for reviews tomorrow

@willie-yao willie-yao mentioned this pull request Jan 25, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbueringer sbueringer sbueringer left review comments

@Jont828 Jont828 Jont828 approved these changes

@JoelSpeed JoelSpeed Awaiting requested review from JoelSpeed

@richardcase richardcase Awaiting requested review from richardcase

Assignees

@CecileRobertMichon CecileRobertMichon

@Jont828 Jont828

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.
Projects
None yet
Milestone
v1.6
Development

Successfully merging this pull request may close these issues.
7 participants
@willie-yao @killianmuldoon @fabriziopandini @k8s-ci-robot @CecileRobertMichon @sbueringer @Jont828