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

🐛 Fix length check in MD helper #8352

Merged
merged 1 commit into from
Mar 23, 2023

Conversation

killianmuldoon
Copy link
Contributor

Update the length checking in the machineDeployment helpers.
Should fix issues with the clusterctl upgrade e2e tests.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 23, 2023
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 23, 2023
@killianmuldoon killianmuldoon changed the title Fix length check in MD helper 🐛 Fix length check in MD helper Mar 23, 2023
Copy link
Member

@fabriziopandini fabriziopandini 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 23, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 3833ee619534f8f2e9147bdf1aac4058b3b22473

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

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 23, 2023
@k8s-ci-robot k8s-ci-robot merged commit 6100ef8 into kubernetes-sigs:main Mar 23, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.5 milestone Mar 23, 2023
@sbueringer
Copy link
Member

@killianmuldoon Should we cherry-pick this?

@killianmuldoon
Copy link
Contributor Author

killianmuldoon commented Apr 23, 2023

Could be useful - good catch.

@killianmuldoon
Copy link
Contributor Author

/cherry-pick release-1.3

@k8s-infra-cherrypick-robot

@killianmuldoon: #8352 failed to apply on top of branch "release-1.3":

Applying: Fix length check in MD helper
Using index info to reconstruct a base tree...
M	test/framework/machinedeployment_helpers.go
Falling back to patching base and 3-way merge...
Auto-merging test/framework/machinedeployment_helpers.go
CONFLICT (content): Merge conflict in test/framework/machinedeployment_helpers.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 Fix length check in MD helper
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:

Could be useful - good catch.

/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

@killianmuldoon: #8352 failed to apply on top of branch "release-1.3":

Applying: Fix length check in MD helper
Using index info to reconstruct a base tree...
M	test/framework/machinedeployment_helpers.go
Falling back to patching base and 3-way merge...
Auto-merging test/framework/machinedeployment_helpers.go
CONFLICT (content): Merge conflict in test/framework/machinedeployment_helpers.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 Fix length check in MD helper
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.

@killianmuldoon
Copy link
Contributor Author

This issue was introduced in #8331 so no need for a backport.

@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
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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants