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 Cluster API to v1.5.2 #2401

Merged
merged 1 commit into from
Sep 28, 2023

Conversation

killianmuldoon
Copy link
Contributor

Bump Cluster API to its latest patch release.

Release notes here: https://github.com/kubernetes-sigs/cluster-api/releases/tag/v1.5.2

Signed-off-by: killianmuldoon <[email protected]>
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 27, 2023
@killianmuldoon
Copy link
Contributor Author

/cherry-pick release-1.8

@k8s-infra-cherrypick-robot

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

In response to this:

/cherry-pick release-1.8

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.

@killianmuldoon
Copy link
Contributor Author

killianmuldoon commented Sep 27, 2023

Not sure what our feeling is on backporting these updates to older branches. It looks like we definitely backported v1.5.1 to 1.8, but release 1.7 and older aren't on latest patch releases.

I'm fine to keep that as the pattern for now, but maybe we should consider updating release-1.7 to CAPI v1.4.7?

@chrischdi @fabriziopandini WDYT?

@codecov
Copy link

codecov bot commented Sep 27, 2023

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (ed46a47) 60.87% compared to head (3ef3ab7) 60.88%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2401      +/-   ##
==========================================
+ Coverage   60.87%   60.88%   +0.01%     
==========================================
  Files         164      164              
  Lines        9473     9473              
==========================================
+ Hits         5767     5768       +1     
+ Misses       3293     3292       -1     
  Partials      413      413              

see 7 files with indirect coverage changes

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

Copy link
Contributor

@zhanggbj zhanggbj left a comment

Choose a reason for hiding this comment

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

/lgtm

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

LGTM label has been added.

Git tree hash: d20bbfaa589bb0155b6ae11f4617c1068c3513ae

@chrischdi
Copy link
Member

Not sure what our feeling is on backporting these updates to older branches. It looks like we definitely backported v1.5.1 to 1.8, but release 1.7 and older aren't on latest patch releases.

I'm fine to keep that as the pattern for now, but maybe we should consider updating release-1.7 to CAPI v1.4.7?

@chrischdi @fabriziopandini WDYT?

+1 to backporting:

  • v1.5.2 to release-1.8
  • v1.4.7 to release-1.7

@chrischdi
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi

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 Sep 28, 2023
@k8s-ci-robot k8s-ci-robot merged commit 7aef3ae into kubernetes-sigs:main Sep 28, 2023
11 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.9 milestone Sep 28, 2023
@k8s-infra-cherrypick-robot

@killianmuldoon: #2401 failed to apply on top of branch "release-1.8":

Applying: Bump Cluster API to v1.5.2
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump Cluster API to v1.5.2
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.8

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.

@killianmuldoon
Copy link
Contributor Author

Will do the backports manually

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants