Skip to content

Conversation

@mboersma
Copy link
Contributor

@mboersma mboersma commented Jul 9, 2024

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Updates CAPI to v1.7.4. Also bumps cert-manager to v1.15.1 to stay in sync with CAPI, and syncs a couple other components in the Makefile.

Which issue(s) this PR fixes:

N/A, but see #4915 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.7.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. 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 Jul 9, 2024
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 9, 2024
@mboersma
Copy link
Contributor Author

mboersma commented Jul 9, 2024

/cherry-pick release-1.15

@k8s-infra-cherrypick-robot

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

In response to this:

/cherry-pick release-1.15

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 added this to the v1.16 milestone Jul 9, 2024
@codecov
Copy link

codecov bot commented Jul 9, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 62.25%. Comparing base (5a3f86f) to head (c2959a5).
Report is 7 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #4974   +/-   ##
=======================================
  Coverage   62.25%   62.25%           
=======================================
  Files         201      201           
  Lines       16912    16912           
=======================================
  Hits        10529    10529           
  Misses       5590     5590           
  Partials      793      793           

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

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

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 10, 2024
@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
Copy link
Contributor

LGTM label has been added.

Git tree hash: 4df5f754f77a894fcee13c02d626f9db5181389f

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 10, 2024
@nojnhuh
Copy link
Contributor

nojnhuh commented Jul 11, 2024

/retest

@k8s-ci-robot k8s-ci-robot merged commit 6864490 into kubernetes-sigs:main Jul 11, 2024
@k8s-infra-cherrypick-robot

@mboersma: #4974 failed to apply on top of branch "release-1.15":

Applying: Bump CAPI to v1.7.4
Using index info to reconstruct a base tree...
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
Auto-merging Tiltfile
CONFLICT (content): Merge conflict in Tiltfile
Auto-merging Makefile
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 CAPI to v1.7.4
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.15

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 Aug 12, 2024
4 tasks
@mboersma mboersma deleted the bump-capi-1.7.4 branch August 14, 2024 16:59
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. 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

Archived in project

Development

Successfully merging this pull request may close these issues.

4 participants