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 retry to clusterctl UpgradeWithBinary #11478

Merged
merged 1 commit into from
Dec 2, 2024
Merged

🌱 Add retry to clusterctl UpgradeWithBinary #11478

merged 1 commit into from
Dec 2, 2024

Conversation

cahillsf
Copy link
Member

What this PR does / why we need it:
adds some retry cushion to clusterctl upgrade

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Related to: #11133 (comment)

/area e2e-testing

@k8s-ci-robot
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@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/e2e-testing Issues or PRs related to e2e testing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 25, 2024
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 25, 2024
@cahillsf cahillsf mentioned this pull request Nov 26, 2024
Closed
@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-latestk8s-main
  • /test pull-cluster-api-e2e-main
  • /test pull-cluster-api-e2e-mink8s-main
  • /test pull-cluster-api-e2e-upgrade-1-31-1-32-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

chrischdi
chrischdi reviewed Nov 26, 2024
View reviewed changes
test/framework/clusterctl/client.go Outdated
var exitErr *exec.ExitError
if errors.As(err, &exitErr) {
stdErr = string(exitErr.Stderr)
Eventually(func() error {
Copy link
Member

Choose a reason for hiding this comment

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

let's use a for loop and make the number of retries dependent on the clusterctl version used (>= v1.7.0 should not do any retries)

@cahillsf cahillsf force-pushed the add-retry-to-clusterctl-upgrade branch from a8bc7ba to a9d315e Compare December 1, 2024 00:56
@cahillsf
Copy link
Member Author

cahillsf commented Dec 1, 2024

/test pull-cluster-api-e2e-main

@cahillsf cahillsf marked this pull request as ready for review December 1, 2024 00:57
@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 Dec 1, 2024
@cahillsf cahillsf force-pushed the add-retry-to-clusterctl-upgrade branch from a9d315e to 624e2a5 Compare December 1, 2024 01:42
@cahillsf
Copy link
Member Author

cahillsf commented Dec 1, 2024

/retest

@cahillsf cahillsf force-pushed the add-retry-to-clusterctl-upgrade branch from 624e2a5 to 2c9caab Compare December 2, 2024 14:46
@chrischdi
Copy link
Member

/lgtm
/approve

/hold so you can merge once your happy (I'm okay).

What are the plans for cherry-picking this?

@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 Dec 2, 2024
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 2, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 6b061c28b313be733d72192aea3fee311bc0d5df

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi

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 Dec 2, 2024
@cahillsf
Copy link
Member Author

cahillsf commented Dec 2, 2024

What are the plans for cherry-picking this?

i think cherry-pick onto all tested release branches (1.7, 1.8, 1.9) does that make sense to you?

@cahillsf
Copy link
Member Author

cahillsf commented Dec 2, 2024

/unhold

@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 Dec 2, 2024
@k8s-ci-robot k8s-ci-robot merged commit df36a1e into kubernetes-sigs:main Dec 2, 2024
19 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.9 milestone Dec 2, 2024
@chrischdi
Copy link
Member

What are the plans for cherry-picking this?

i think cherry-pick onto all tested release branches (1.7, 1.8, 1.9) does that make sense to you?

Sounds good.

@cahillsf
Copy link
Member Author

cahillsf commented Dec 4, 2024

/cherry-pick release-1.9

@k8s-infra-cherrypick-robot
Copy link

@cahillsf: new pull request created: #11539

In response to this:

/cherry-pick release-1.9

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-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Dec 4, 2024
Merged
@cahillsf
Copy link
Member Author

cahillsf commented Dec 4, 2024

/cherry-pick release-1.8

@k8s-infra-cherrypick-robot
Copy link

@cahillsf: new pull request created: #11541

In response to this:

/cherry-pick release-1.8

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-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Dec 4, 2024
Merged
@cahillsf
Copy link
Member Author

cahillsf commented Dec 4, 2024

/cherry-pick release-1.7

@k8s-infra-cherrypick-robot
Copy link

@cahillsf: new pull request created: #11542

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.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Dec 4, 2024
Merged
@nrb nrb mentioned this pull request Dec 11, 2024
Open
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chrischdi chrischdi chrischdi left review comments

@JoelSpeed JoelSpeed Awaiting requested review from JoelSpeed

@richardcase richardcase Awaiting requested review from richardcase

@jackfrancis jackfrancis Awaiting requested review from jackfrancis

Assignees

@chrischdi chrischdi

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.9
Development

Successfully merging this pull request may close these issues.
4 participants
@cahillsf @k8s-ci-robot @chrischdi @k8s-infra-cherrypick-robot