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

🌱 Bump CAPI to v1.8.4 #5061

Merged
merged 11 commits into from
Oct 16, 2024
Merged

🌱 Bump CAPI to v1.8.4 #5061

merged 11 commits into from
Oct 16, 2024

Conversation

damdo
Copy link
Member

@damdo damdo commented Jul 17, 2024 •
edited
Loading

What type of PR is this?

/kind support

What this PR does / why we need it:
CAPI v1.8.0-beta.0 is out now, so this PRs bumps the CAPI version used by CAPA with the new released one.

Bumps CAPI to v1.8.x based on https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/book/src/developer/providers/migrations/v1.7-to-v1.8.md

Special notes for your reviewer:

TODO:

  • [ ] The support for INIT env variables was dropped in the clusterctl upgrade tests. If you were using INIT_WITH_BINARY, INIT_WITH_PROVIDERS_CONTRACT or INIT_WITH_KUBERNETES_VERSION consider using the corresponding fields in ClusterctlUpgradeSpecInput. If you prefer to use environment variables, read them e.g. via os.Getenv and then set the spec fields accordingly. we do this already!
  • [ ] remote.NewClusterCacheTracker now has options to configure QPS & Burst. It's highly recommended to implement corresponding flags the same way as core Cluster API (see PR: ✨ Add QPS & burst options & flags for ClusterCacheTracker cluster-api#10880) we don't use this.

Release note:

Bump CAPI to v1.8.4

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Jul 17, 2024
@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 kind/support Categorizes issue or PR as a support question. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jul 17, 2024
@k8s-ci-robot k8s-ci-robot added needs-priority size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 17, 2024
@damdo damdo changed the title WIP: 🌱 Bump CAPI to v1.7.0 WIP: 🌱 Bump CAPI to v1.8.0 Jul 17, 2024
@damdo
Copy link
Member Author

damdo commented Jul 17, 2024

/cc @nrb

@k8s-ci-robot k8s-ci-robot requested a review from nrb July 17, 2024 16:48
@damdo
Copy link
Member Author

damdo commented Jul 18, 2024

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

@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 18, 2024
@damdo damdo marked this pull request as ready for review July 18, 2024 10:08
@damdo
Copy link
Member Author

damdo commented Jul 18, 2024

/hold
For testing

@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 Jul 18, 2024
@damdo damdo mentioned this pull request Jul 18, 2024
Merged
@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 30, 2024
@nrb
Copy link
Contributor

nrb commented Jul 30, 2024

Looks like we'll need to bump tests to use Go 1.22.

@damdo
Copy link
Member Author

damdo commented Jul 31, 2024

/retest

@nrb
Copy link
Contributor

nrb commented Jul 31, 2024 •
edited
Loading

Per CAPI community meeting discussion, we should stop setting the caBundle value with the update to CAPI 1.8.0 and Kube 1.31.

See kubernetes-sigs/cluster-api#10972

@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 Sep 20, 2024
@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 Sep 20, 2024
@damdo
Copy link
Member Author

damdo commented Oct 16, 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 Oct 16, 2024
@damdo damdo added this to the v2.7.0 milestone Oct 16, 2024
@richardcase richardcase added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Oct 16, 2024
richardcase
richardcase reviewed Oct 16, 2024
View reviewed changes
test/e2e/data/e2e_conf.yaml Outdated Show resolved Hide resolved
versions.mk Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 16, 2024
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Oct 16, 2024 •
edited
Loading

@damdo: 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 ad7f185 link false /test pull-cluster-api-provider-aws-e2e
pull-cluster-api-provider-aws-e2e-eks ad7f185 link false /test pull-cluster-api-provider-aws-e2e-eks

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

damdo and others added 11 commits October 16, 2024 12:57
@damdo
capi v1.8.0-beta.0
09aed90
@damdo
use source.Kind generics
a5c37fd
@damdo
update e2e testing versions
20cd532
@damdo
set terminationMessagePolicy to FallbackToLogsOnError for manager
db61895
@damdo
bump go version to 1.22
18c14ea
@nrb @damdo
Update metrics options for new types
7a92cf2 
Signed-off-by: Nolan Brubaker <[email protected]>
@nrb @damdo
Update to CAPI 1.8.3
53cabbb 
Signed-off-by: Nolan Brubaker <[email protected]>
@nrb @damdo
Fix test linting
4a4224b 
Signed-off-by: Nolan Brubaker <[email protected]>
@nrb @damdo
Use latest versions of setup-envtest
31b0692 
Signed-off-by: Nolan Brubaker <[email protected]>
@nrb @damdo
Update generation tools for Kube 1.30
5edebd7 
We carry a very small patch for the conversion-gen tool so that we can
support having types of the same name in both the standard and
experimental APIs. During the v1.30 timeframe, the Kubernetes code
generation tools were refactored to more modern Go module standards,
while also cleaning up the code.

This commit carries the v1.30 (specifically,
commit 304c1999892b41b6a3ff5dae260253f39cf53660) changes for the main.go
and conversion.go files, alongside our patch.

This commit also includes the updated conversion code output by our
vendored/forked conversion_gen tool.

Signed-off-by: Nolan Brubaker <[email protected]>
@damdo
Update to CAPI 1.8.4
fcacf41
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 16, 2024
@richardcase
Copy link
Member

The e2e tests are not passing on this. This is probably due to the AMI changes. Let's merge and follow-up on the e2e tests. We have #5161 created and added to the v2.7.0 milestone as a "release blocker". Based on this:

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: richardcase

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 Oct 16, 2024
@damdo damdo changed the title 🌱 Bump CAPI to v1.8.0 🌱 Bump CAPI to v1.8.x Oct 16, 2024
@damdo damdo changed the title 🌱 Bump CAPI to v1.8.x 🌱 Bump CAPI to v1.8.4 Oct 16, 2024
@richardcase
Copy link
Member

Both @nrb and @damdo are happy with each others changes so:

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 16, 2024
@k8s-ci-robot k8s-ci-robot merged commit 7e0812f into kubernetes-sigs:main Oct 16, 2024
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nrb nrb nrb left review comments

@Ankitasw Ankitasw Awaiting requested review from Ankitasw

@dlipovetsky dlipovetsky Awaiting requested review from dlipovetsky

@AndiDog AndiDog Awaiting requested review from AndiDog

@cnmcavoy cnmcavoy Awaiting requested review from cnmcavoy

@richardcase richardcase Awaiting requested review from richardcase

Assignees

@richardcase richardcase

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. kind/support Categorizes issue or PR as a support question. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority 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. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Milestone
v2.7.0
Development

Successfully merging this pull request may close these issues.
4 participants
@damdo @k8s-ci-robot @nrb @richardcase