🌱 Bump CAPI to v1.8.4 #5061

damdo · 2024-07-17T16:45:45Z

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 · 2024-07-17T16:45:48Z

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

damdo · 2024-07-17T16:48:47Z

/cc @nrb

damdo · 2024-07-18T08:49:53Z

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

damdo · 2024-07-18T10:08:43Z

/hold
For testing

nrb · 2024-07-30T17:26:25Z

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

damdo · 2024-07-31T08:20:12Z

/retest

nrb · 2024-07-31T17:28:30Z

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

test/e2e/data/e2e_conf.yaml

versions.mk

k8s-ci-robot · 2024-10-16T10:53:11Z

@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.

Signed-off-by: Nolan Brubaker <[email protected]>

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]>

richardcase · 2024-10-16T11:48:51Z

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 · 2024-10-16T11:48:59Z

[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:

~~OWNERS~~ [richardcase]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

richardcase · 2024-10-16T12:46:21Z

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

/lgtm

* capi v1.8.0-beta.0 * use source.Kind generics * update e2e testing versions * set terminationMessagePolicy to FallbackToLogsOnError for manager * bump go version to 1.22 * Update metrics options for new types Signed-off-by: Nolan Brubaker <[email protected]> * Update to CAPI 1.8.3 Signed-off-by: Nolan Brubaker <[email protected]> * Fix test linting Signed-off-by: Nolan Brubaker <[email protected]> * Use latest versions of setup-envtest Signed-off-by: Nolan Brubaker <[email protected]> * Update generation tools for Kube 1.30 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]> * Update to CAPI 1.8.4 --------- Signed-off-by: Nolan Brubaker <[email protected]> Co-authored-by: Nolan Brubaker <[email protected]>

mloiseleur · 2024-10-28T09:48:45Z

@nrb: I'm not sure why, but caBundle was removed in your force push but was not merged, at the end.

See for instance https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/config/crd/patches/webhook_in_awsclustercontrolleridentities.yaml#L15

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 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 requested review from Ankitasw and dlipovetsky July 17, 2024 16:45

k8s-ci-robot added needs-priority size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 17, 2024

damdo changed the title ~~WIP: 🌱 Bump CAPI to v1.7.0~~ WIP: 🌱 Bump CAPI to v1.8.0 Jul 17, 2024

k8s-ci-robot requested a review from nrb July 17, 2024 16:48

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 marked this pull request as ready for review July 18, 2024 10:08

k8s-ci-robot requested review from AndiDog and cnmcavoy July 18, 2024 10:08

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 mentioned this pull request Jul 18, 2024

Bump CAPA to use k8s 1.30 kubernetes/test-infra#33018

Merged

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 30, 2024

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

nrb force-pushed the capi-1.8.0 branch from 5612f0f to b92ca54 Compare September 20, 2024 21:12

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

richardcase added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Oct 16, 2024

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 added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 16, 2024

damdo and others added 11 commits October 16, 2024 12:57

capi v1.8.0-beta.0

09aed90

use source.Kind generics

a5c37fd

update e2e testing versions

20cd532

set terminationMessagePolicy to FallbackToLogsOnError for manager

db61895

bump go version to 1.22

18c14ea

Update metrics options for new types

7a92cf2

Signed-off-by: Nolan Brubaker <[email protected]>

Update to CAPI 1.8.3

53cabbb

Signed-off-by: Nolan Brubaker <[email protected]>

Fix test linting

4a4224b

Signed-off-by: Nolan Brubaker <[email protected]>

Use latest versions of setup-envtest

31b0692

Signed-off-by: Nolan Brubaker <[email protected]>

Update to CAPI 1.8.4

fcacf41

damdo force-pushed the capi-1.8.0 branch from 441507b to fcacf41 Compare October 16, 2024 10:58

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 16, 2024

damdo requested a review from richardcase October 16, 2024 11:37

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 changed the title ~~🌱 Bump CAPI to v1.8.0~~ 🌱 Bump CAPI to v1.8.x Oct 16, 2024

damdo changed the title ~~🌱 Bump CAPI to v1.8.x~~ 🌱 Bump CAPI to v1.8.4 Oct 16, 2024

k8s-ci-robot assigned richardcase Oct 16, 2024

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 merged commit 7e0812f into kubernetes-sigs:main Oct 16, 2024
28 checks passed

nojnhuh mentioned this pull request Nov 12, 2024

Bump CAPI to v1.8.5 kubernetes-sigs/cluster-api-provider-azure#5255

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🌱 Bump CAPI to v1.8.4 #5061

🌱 Bump CAPI to v1.8.4 #5061

damdo commented Jul 17, 2024 •

edited

Loading

k8s-ci-robot commented Jul 17, 2024

damdo commented Jul 17, 2024

damdo commented Jul 18, 2024

damdo commented Jul 18, 2024

nrb commented Jul 30, 2024

damdo commented Jul 31, 2024

nrb commented Jul 31, 2024 •

edited

Loading

k8s-ci-robot commented Oct 16, 2024 •

edited

Loading

richardcase commented Oct 16, 2024

k8s-ci-robot commented Oct 16, 2024

richardcase commented Oct 16, 2024

mloiseleur commented Oct 28, 2024

🌱 Bump CAPI to v1.8.4 #5061

🌱 Bump CAPI to v1.8.4 #5061

Conversation

damdo commented Jul 17, 2024 • edited Loading

k8s-ci-robot commented Jul 17, 2024

damdo commented Jul 17, 2024

damdo commented Jul 18, 2024

damdo commented Jul 18, 2024

nrb commented Jul 30, 2024

damdo commented Jul 31, 2024

nrb commented Jul 31, 2024 • edited Loading

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

richardcase commented Oct 16, 2024

k8s-ci-robot commented Oct 16, 2024

richardcase commented Oct 16, 2024

mloiseleur commented Oct 28, 2024

damdo commented Jul 17, 2024 •

edited

Loading

nrb commented Jul 31, 2024 •

edited

Loading

k8s-ci-robot commented Oct 16, 2024 •

edited

Loading