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

✨clusterctl upgrade apply: wait for providers to be ready #6466

Merged
merged 1 commit into from
Jun 21, 2022

Conversation

praveenrewar
Copy link
Contributor

What this PR does / why we need it:
clusterctl upgrade apply should wait for the cluster to be 'ready' before exiting.

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 #6267

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 30, 2022
@k8s-ci-robot
Copy link
Contributor

Hi @praveenrewar. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Apr 30, 2022
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 30, 2022
Copy link
Contributor

@ykakarap ykakarap left a comment

Choose a reason for hiding this comment

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

@praveenrewar Thank you for working on this! 🚀

I am LGTM with the overall approach. I will take another look after we have more information about the breaking API change.

cmd/clusterctl/cmd/upgrade_apply.go Outdated Show resolved Hide resolved
cmd/clusterctl/cmd/upgrade_apply.go Outdated Show resolved Hide resolved
cmd/clusterctl/client/upgrade.go Outdated Show resolved Hide resolved
cmd/clusterctl/client/cluster/upgrader.go Outdated Show resolved Hide resolved
Copy link
Contributor

@ykakarap ykakarap left a comment

Choose a reason for hiding this comment

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

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 3, 2022
@praveenrewar praveenrewar force-pushed the main branch 2 times, most recently from 63563a8 to 1e789c4 Compare May 30, 2022 12:43
@praveenrewar praveenrewar changed the title ✨[WIP] clusterctl upgrade apply: wait for providers to be ready ✨clusterctl upgrade apply: wait for providers to be ready May 30, 2022
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.

Just a few nits, otherwise lgtm from my side

P.S. Yuvaraj commented on them before as well, did you maybe only forget to push a commit?

cmd/clusterctl/cmd/upgrade_apply.go Outdated Show resolved Hide resolved
cmd/clusterctl/cmd/upgrade_apply.go Outdated Show resolved Hide resolved
cmd/clusterctl/client/upgrade.go Outdated Show resolved Hide resolved
cmd/clusterctl/client/upgrade.go Outdated Show resolved Hide resolved
@praveenrewar
Copy link
Contributor Author

P.S. Yuvaraj commented on them before as well, did you maybe only forget to push a commit?

Oops, my bad. Good catch! Thanks :)

@praveenrewar
Copy link
Contributor Author

From the issue:

Additional note: After this feature is implemented there we can probably refactor some our e2e tests to remove the wait logic and instead just call the upgrade command with the corresponding wait flags

Should I update the e2e tests as part of the same PR or does it make sense to have a separate PR for it?
(I am leaning towards making the change in this PR itself but okay with both the options)

@sbueringer
Copy link
Member

sbueringer commented May 31, 2022

Oops, my bad. Good catch! Thanks :)

Thx for the quick fix :).

Should I update the e2e tests as part of the same PR or does it make sense to have a separate PR for it? (I am leaning towards making the change in this PR itself but okay with both the options)

I would suggest to make it a separate PR. I think this PR now would be ready for a final review from someone else + merge.

Can you please squash the commits? We're running Prow in merge mode for our release notes tool, so we have to merge manually on the PRs ourselves. (apart from squash, lgtm from my side)

clusterctl upgrade apply: Add --wait-providers flags that can be used to wait for providers to be updated

Co-Authored-By: Stefan Büringer <[email protected]>
@praveenrewar
Copy link
Contributor Author

I would suggest to make it a separate PR. I think this PR now would be ready for a final review from someone else + merge.

Cool 👍🏻

Can you please squash the commits?

Sure, done :)

@k8s-ci-robot
Copy link
Contributor

@praveenrewar: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-apidiff-main 1bb1142 link false /test pull-cluster-api-apidiff-main

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@sbueringer
Copy link
Member

Thx!

/lgtm
/assign @ykakarap

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 31, 2022
@praveenrewar
Copy link
Contributor Author

Hey @ykakarap, do let me know if anything else is required on this PR :)

@sbueringer
Copy link
Member

/assign @fabriziopandini
for a final look

@chrischdi
Copy link
Member

/lgtm

Copy link
Contributor

@ykakarap ykakarap left a comment

Choose a reason for hiding this comment

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

/lgtm

Should I update the e2e tests as part of the same PR or does it make sense to have a separate PR for it?
(I am leaning towards making the change in this PR itself but okay with both the options)

A separate PR for that would be ideal.

@sbueringer
Copy link
Member

/lgtm
/approve

/cherry-pick release-1.2

@k8s-infra-cherrypick-robot

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

In response to this:

/lgtm
/approve

/cherry-pick release-1.2

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-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 Jun 21, 2022
@k8s-ci-robot k8s-ci-robot merged commit fc337b5 into kubernetes-sigs:main Jun 21, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.2 milestone Jun 21, 2022
@k8s-infra-cherrypick-robot

@sbueringer: new pull request created: #6685

In response to this:

/lgtm
/approve

/cherry-pick release-1.2

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.

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. 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

add flags to clusterctl upgrade apply to wait for the upgrade to finish before exiting
7 participants