Skip to content

Bump CAPI to v1.9.5 #5438

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
Merged
merged 1 commit into from
Feb 27, 2025
Merged

Bump CAPI to v1.9.5 #5438

merged 1 commit into from
Feb 27, 2025

Conversation

mboersma
Copy link
Contributor

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Updates CAPI to v1.9.5.

Which issue(s) this PR fixes:

N/A, but see #5316 for prior art.

Special notes for your reviewer:

  • cherry-pick candidate

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

Bump CAPI to v1.9.5

@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/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 19, 2025
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 19, 2025
@mboersma
Copy link
Contributor Author

/cherry-pick release-1.18

@k8s-infra-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-1.18

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.

@codecov Codecov
Copy link

codecov bot commented Feb 19, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 52.41%. Comparing base (0f04d8d) to head (83d2d85).
Report is 15 commits behind head on main.

Additional details and impacted files 
@@           Coverage Diff           @@
##             main    #5438   +/-   ##
=======================================
  Coverage   52.41%   52.41%           
=======================================
  Files         272      272           
  Lines       29361    29361           
=======================================
  Hits        15390    15390           
  Misses      13165    13165           
  Partials      806      806

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

bryan-cox
bryan-cox reviewed Feb 19, 2025
View reviewed changes
Makefile
@@ -34,7 +34,7 @@ export GOPROXY
export GO111MODULE=on

# Kubebuilder.
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.31.0
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.32.0
Copy link
Contributor

Choose a reason for hiding this comment

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

Since this is getting bumped, would we want to bump the k8s version in the go.mod as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point, seems like they should be synced ideally. But CAPI has this in the release-1.9 branch and still has v0.31.3 in go.mod for Kubernetes imports. 🤷

Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm, interesting 🤷🏻‍♂️

@mboersma
Copy link
Contributor Author

/hold

I forgot to update some things here.

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 19, 2025
@mboersma
Copy link
Contributor Author

/hold cancel

@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 Feb 19, 2025
@mboersma mboersma force-pushed the bump-capi-one-nine-five branch from ab19612 to dc6a09e Compare February 19, 2025 23:07
@mboersma mboersma force-pushed the bump-capi-one-nine-five branch from dc6a09e to 83d2d85 Compare February 19, 2025 23:08
willie-yao
willie-yao approved these changes Feb 27, 2025
View reviewed changes
Copy link
Contributor

@willie-yao willie-yao left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 27, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 31018af96f74a3d89932940e966bf794000a1d7d

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: willie-yao

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 Feb 27, 2025
@k8s-ci-robot k8s-ci-robot merged commit bfdbbd8 into kubernetes-sigs:main Feb 27, 2025
25 checks passed
@github-project-automation github-project-automation bot moved this from Todo to Done in CAPZ Planning Feb 27, 2025
@k8s-infra-cherrypick-robot
Copy link

@mboersma: #5438 failed to apply on top of branch "release-1.18":

Applying: Bump CAPI to v1.9.5
Using index info to reconstruct a base tree...
M	docs/book/src/getting-started.md
M	go.mod
M	go.sum
M	test/e2e/config/azure-dev.yaml
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/config/azure-dev.yaml
CONFLICT (content): Merge conflict in test/e2e/config/azure-dev.yaml
Auto-merging go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging docs/book/src/getting-started.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Bump CAPI to v1.9.5

In response to this:

/cherry-pick release-1.18

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.

@mboersma mboersma deleted the bump-capi-one-nine-five branch February 27, 2025 20:41
@mboersma mboersma mentioned this pull request Feb 27, 2025
Merged
4 tasks
@mboersma mboersma mentioned this pull request Mar 31, 2025
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@willie-yao willie-yao willie-yao approved these changes

@Jont828 Jont828 Awaiting requested review from Jont828

@nojnhuh nojnhuh Awaiting requested review from nojnhuh

+1 more reviewer

@bryan-cox bryan-cox bryan-cox left review comments

Reviewers whose approvals may not affect merge requirements
Assignees

@willie-yao willie-yao

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/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
CAPZ Planning
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@mboersma @k8s-infra-cherrypick-robot @k8s-ci-robot @willie-yao @bryan-cox