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

Bump CAPI to v1.5.0 #4398

Closed

Conversation

furkatgofurov7
Copy link
Member

@furkatgofurov7 furkatgofurov7 commented Jul 14, 2023

What type of PR is this?
/kind support

What this PR does / why we need it:
Bumps CAPI to v1.5.0-rc.1 based on https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/book/src/developer/providers/migrations/v1.4-to-v1.5.md

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 #4375, #4390

Special notes for your reviewer:

Checklist:

  • squashed commits
  • includes documentation
  • adds unit tests
  • adds or updates e2e tests

Release note:

Bump CAPI to v1.5.0

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/support Categorizes issue or PR as a support question. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 14, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign sbueringer for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@furkatgofurov7 furkatgofurov7 changed the title Bump CAPI to v1.5.0-rc.0 WIP: Bump CAPI to v1.5.0-rc.0 Jul 14, 2023
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 14, 2023
@richardcase
Copy link
Member

@furkatgofurov7 - maybe a make generate is needed?

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 18, 2023
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 18, 2023
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 20, 2023
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 20, 2023
@furkatgofurov7 furkatgofurov7 force-pushed the bump-capi-v1.5 branch 2 times, most recently from 3b452be to 639abcf Compare July 21, 2023 11:50
@furkatgofurov7
Copy link
Member Author

/retitle Bump CAPI to v1.5.0-rc.1

This should be ready for review!

/cc @richardcase @Ankitasw @Skarlso

@k8s-ci-robot k8s-ci-robot requested review from Ankitasw and Skarlso July 21, 2023 11:56
@furkatgofurov7 furkatgofurov7 changed the title Bump CAPI to v1.5.0-rc.1 Bump CAPI to v1.5.0 Aug 18, 2023
@furkatgofurov7
Copy link
Member Author

furkatgofurov7 commented Aug 18, 2023

@furkatgofurov7 could you be able to update this to use v1.5.0 instead of the RC now it's released?

@richardcase it has been already updated to v1.5.0 but forgot to update the title. Anyways it needs a rebase, pushing it..

furkatgofurov7 and others added 5 commits August 18, 2023 09:57
Signed-off-by: Furkat Gofurov <[email protected]>
Signed-off-by: Furkat Gofurov <[email protected]>
The tests where failing after upgrading controller-runtime due to changes in
the fake client.

Signed-off-by: Richard Case <[email protected]>
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 18, 2023
@furkatgofurov7
Copy link
Member Author

/test pull-cluster-api-provider-aws-e2e-eks
/test pull-cluster-api-provider-aws-e2e

@richardcase
Copy link
Member

Re-running it case it was a flake:

/test pull-cluster-api-provider-aws-e2e

@furkatgofurov7
Copy link
Member Author

furkatgofurov7 commented Aug 21, 2023

Re-running it case it was a flake:

GH rate limit was hit with this run, rerunning it again

/test pull-cluster-api-provider-aws-e2e

@furkatgofurov7
Copy link
Member Author

Re-running it case it was a flake:

GH rate limit was hit with this run, rerunning it again

same

/test pull-cluster-api-provider-aws-e2e

@richardcase
Copy link
Member

/test pull-cluster-api-provider-aws-e2e

1 similar comment
@richardcase
Copy link
Member

/test pull-cluster-api-provider-aws-e2e

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 25, 2023
@Ankitasw
Copy link
Member

Ankitasw commented Sep 5, 2023

@furkatgofurov7 do you need any help here?

@Ankitasw
Copy link
Member

@richardcase would you be able to spend some time here?

@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 20, 2023
@k8s-ci-robot
Copy link
Contributor

Adding label do-not-merge/contains-merge-commits because PR contains merge commits, which are not allowed in this repository.
Use git rebase to reapply your commits on top of the target branch. Detailed instructions for doing so can be found 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.

@Ankitasw
Copy link
Member

@furkatgofurov7 @richardcase I dont have permission to edit the PR so couldn't push the changes, could any of you resolve the conflicts, then we can merge this on priority

@k8s-ci-robot
Copy link
Contributor

@furkatgofurov7: The following tests 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-provider-aws-e2e e758b8f link false /test pull-cluster-api-provider-aws-e2e
pull-cluster-api-provider-aws-test ca3df8d link true /test pull-cluster-api-provider-aws-test
pull-cluster-api-provider-aws-build ca3df8d link true /test pull-cluster-api-provider-aws-build
pull-cluster-api-provider-aws-verify ca3df8d link true /test pull-cluster-api-provider-aws-verify

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.

@Ankitasw
Copy link
Member

I ll cherry pick the changes from this PR and raise a new one for fixing the tests and rebasing.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 21, 2023
@k8s-ci-robot
Copy link
Contributor

PR needs rebase.

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.

@Ankitasw
Copy link
Member

/close

in favor of #4510

@k8s-ci-robot
Copy link
Contributor

@Ankitasw: Closed this PR.

In response to this:

/close

in favor of #4510

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
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/contains-merge-commits kind/support Categorizes issue or PR as a support question. needs-priority needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CAPI v1.5.0-beta.0 has been released and is ready for testing
4 participants