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

🐛 test/e2e: use topology cluster-template for clusterctl upgrade mgmt cluster #8311

Merged
merged 1 commit into from
Mar 19, 2023
Merged

🐛 test/e2e: use topology cluster-template for clusterctl upgrade mgmt cluster #8311

merged 1 commit into from
Mar 19, 2023

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Mar 19, 2023 •
edited
Loading

Signed-off-by: Stefan Büringer [email protected]

What this PR does / why we need it:
This should make the v0.3, v0.4 & v1.0 clusterctl upgrades more stable.

Currently they are using the default flavor. But the default flavor is not setting the cgroupDriver to cgroupfs for Kubernetes < 1.24.

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 #

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 19, 2023
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 19, 2023
@sbueringer
Copy link
Member Author

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

@sbueringer sbueringer changed the title 🐛 test/e2e: use topology cluster-template for clusterctl upgrade mgmt 🐛 test/e2e: use topology cluster-template for clusterctl upgrade mgmt cluster Mar 19, 2023
@sbueringer sbueringer force-pushed the pr-fix-clusterctl-upgrade branch from 25a9ac1 to 99761eb Compare March 19, 2023 13:23
@sbueringer
Copy link
Member Author

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

@sbueringer
Copy link
Member Author

/assign @fabriziopandini @killianmuldoon

@sbueringer
Copy link
Member Author

/cherry-pick release-1.3

@k8s-infra-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-1.3

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.

@sbueringer
Copy link
Member Author

/cherry-pick release-1.4

@k8s-infra-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-1.4

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.

@sbueringer
Copy link
Member Author

/retest

killianmuldoon
killianmuldoon reviewed Mar 19, 2023
View reviewed changes
Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

/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 Mar 19, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 86ff935118b65b14cebb30e71468c87bfd3bc250

@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 Mar 19, 2023
@k8s-ci-robot k8s-ci-robot merged commit e7589e1 into kubernetes-sigs:main Mar 19, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.5 milestone Mar 19, 2023
@k8s-infra-cherrypick-robot
Copy link

@sbueringer: #8311 failed to apply on top of branch "release-1.3":

Applying: test/e2e: use topology cluster-template for clusterctl upgrade mgmt cluster
Using index info to reconstruct a base tree...
M	test/e2e/clusterctl_upgrade_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/clusterctl_upgrade_test.go
CONFLICT (content): Merge conflict in test/e2e/clusterctl_upgrade_test.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 test/e2e: use topology cluster-template for clusterctl upgrade mgmt cluster
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.3

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.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Mar 19, 2023
Merged
@k8s-infra-cherrypick-robot
Copy link

@sbueringer: new pull request created: #8314

In response to this:

/cherry-pick release-1.4

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.

@sbueringer sbueringer deleted the pr-fix-clusterctl-upgrade branch March 20, 2023 03:07
@sbueringer sbueringer mentioned this pull request Mar 20, 2023
Merged
@sbueringer
Copy link
Member Author

sbueringer commented Mar 20, 2023 •
edited
Loading

@killianmuldoon Tested this PR by running the v0.3 clusterctl upgrade test locally which didn't work before (although my sample size was small).

Would be great if you can also do a test on Tuesday (IIRC you definitely hit the issue every time)

sbueringer
sbueringer commented Mar 20, 2023
View reviewed changes
test/e2e/clusterctl_upgrade_test.go
@@ -126,7 +136,10 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.2=>cur
// try to deploy the latest version of our test-extension from docker.yaml.
InitWithRuntimeExtensionProviders: []string{},
InitWithKubernetesVersion: "v1.26.0",
WorkloadFlavor: "topology",
// TODO(sbueringer) The topology flavor enables PSA.
Copy link
Member Author

Choose a reason for hiding this comment

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

I follow-up on this TODO once I'm back from PTO in April

@killianmuldoon
Copy link
Contributor

@sbueringer both tests are running for me locally now - thanks for tracking that down.!

@sbueringer
Copy link
Member Author

Thx for verifying!!

This was referenced Apr 24, 2023
Merged
Merged
@johannesfrey
Copy link
Contributor

/area e2e-testing

@k8s-ci-robot k8s-ci-robot added the area/e2e-testing Issues or PRs related to e2e testing label Jun 16, 2023
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 Awaiting requested review from chrischdi

@stmcginnis stmcginnis Awaiting requested review from stmcginnis

Assignees

@fabriziopandini fabriziopandini

@killianmuldoon killianmuldoon

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/e2e-testing Issues or PRs related to e2e 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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.5
Development

Successfully merging this pull request may close these issues.
6 participants
@sbueringer @k8s-infra-cherrypick-robot @k8s-ci-robot @killianmuldoon @johannesfrey @fabriziopandini