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.5 #5255

Merged
merged 1 commit into from
Nov 14, 2024
Merged

Bump CAPI to v1.8.5 #5255

merged 1 commit into from
Nov 14, 2024

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.8.5. Also bumps cert-manager and fixes the pre-commit hook shellcheck configuration to match the Makefile.

Which issue(s) this PR fixes:

N/A, but see #5186 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.8.5

@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 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. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels Nov 11, 2024
@mboersma mboersma marked this pull request as ready for review November 11, 2024 18:42
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Nov 11, 2024
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 11, 2024
@mboersma
Copy link
Contributor Author

/cherry-pick release-1.17

@k8s-infra-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-1.17

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 Nov 11, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 52.78%. Comparing base (ec18b58) to head (9802f19).
Report is 12 commits behind head on main.

Additional details and impacted files 
@@           Coverage Diff           @@
##             main    #5255   +/-   ##
=======================================
  Coverage   52.78%   52.78%           
=======================================
  Files         270      270           
  Lines       29057    29057           
=======================================
  Hits        15337    15337           
  Misses      12928    12928           
  Partials      792      792

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

@mboersma mboersma mentioned this pull request Nov 11, 2024
Closed
bryan-cox
bryan-cox reviewed Nov 12, 2024
View reviewed changes
go.mod Outdated
@@ -222,6 +222,6 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.4
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.5
Copy link
Contributor

Choose a reason for hiding this comment

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

Could this replace just be removed since it matches the version in the go.mod?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, apparently it can. :-) I've just been updating this line robotically and forgotten why we added it in the first place, but it doesn't seem that it's needed to pin it now: make modules doesn't change dependencies if I remove it.

Thanks for noticing this!

Copy link
Contributor

Choose a reason for hiding this comment

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

I remember asking this same question like 2 years ago and found it was necessary but can't remember exactly why. I'll try to track down a discussion but I vaguely remember something failing in e2e without this.

Copy link
Contributor

Choose a reason for hiding this comment

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

#2989 (comment)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I vaguely remember now... Thanks for the research @nojnhuh!

Let's see how it fares in CI. I'll restore that line if needed.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, thanks for the context! Interestingly enough, it looks like CAPI never did add that or if they did, it's not in the current go.mod.

Copy link
Contributor

Choose a reason for hiding this comment

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

It would make sense CAPI doesn't do this since their main module doesn't import their test module. Though it looks like CAPA recently got rid of this, so maybe we should be ok to remove it too? kubernetes-sigs/cluster-api-provider-aws#5061

Copy link
Contributor

Choose a reason for hiding this comment

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

I tried checking out the 1.6 branch of CAPZ and building without the replace and things seem to work fine. Maybe a Go change enabled this? It doesn't seem like CAPI has fundamentally changed things since then.

@mboersma mboersma force-pushed the capi-one-eight-five branch from a4cd815 to 9802f19 Compare November 12, 2024 20:48
@bryan-cox
Copy link
Contributor

/test pull-cluster-api-provider-azure-apiversion-upgrade

@mboersma
Copy link
Contributor Author

I think the -upgrade test will pass when #5266 gets merged. 🤞🏻

@mboersma
Copy link
Contributor Author

/retest

@mboersma
Copy link
Contributor Author

This is passing all tests, PTAL.

nojnhuh
nojnhuh approved these changes Nov 14, 2024
View reviewed changes
Copy link
Contributor

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

go.mod
@@ -222,6 +222,4 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.4

replace github.com/google/cel-go => github.com/google/cel-go v0.17.8
Copy link
Contributor

Choose a reason for hiding this comment

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

We should throw a party when we can get rid of the last replace.

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

LGTM label has been added.

Git tree hash: e94ebfcfb6117137dede39fb3967018b9cb57bb1

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nojnhuh

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 Nov 14, 2024
@dtzar dtzar added this to the v1.18 milestone Nov 14, 2024
@k8s-ci-robot k8s-ci-robot merged commit 630e39c into kubernetes-sigs:main Nov 14, 2024
24 checks passed
@k8s-infra-cherrypick-robot
Copy link

@mboersma: #5255 failed to apply on top of branch "release-1.17":

Applying: Bump CAPI to v1.8.5
Using index info to reconstruct a base tree...
M	.pre-commit-config.yaml
M	Makefile
M	Tiltfile
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 Tiltfile
Auto-merging Makefile
Auto-merging .pre-commit-config.yaml
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.8.5

In response to this:

/cherry-pick release-1.17

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 mentioned this pull request Nov 14, 2024
Merged
4 tasks
@mboersma mboersma deleted the capi-one-eight-five branch November 14, 2024 23:07
@mboersma mboersma mentioned this pull request Dec 11, 2024
Closed
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

@nojnhuh nojnhuh nojnhuh approved these changes

@willie-yao willie-yao Awaiting requested review from willie-yao

@jackfrancis jackfrancis Awaiting requested review from jackfrancis

@Jont828 Jont828 Awaiting requested review from Jont828

Assignees

@nojnhuh nojnhuh

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
v1.18
Development

Successfully merging this pull request may close these issues.
6 participants
@mboersma @k8s-ci-robot @k8s-infra-cherrypick-robot @bryan-cox @nojnhuh @dtzar