search

kubernetes-sigs / cluster-api-provider-azure

Cluster API implementation for Microsoft Azure
https://capz.sigs.k8s.io/
Apache License 2.0
293 stars 422 forks source link

Bump CAPI to v1.7.3 #4915

Closed mboersma closed 3 months ago

mboersma commented 3 months ago

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Updates CAPI to v1.7.3. Also bumps cert-manager to v1.15.0 to stay in sync with CAPI.

Which issue(s) this PR fixes:

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

Special notes for your reviewer:

TODOs:

Release note:

Bump CAPI to v1.7.3
codecov[bot] commented 3 months ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 62.19%. Comparing base (de31bcc) to head (fe1027c).

Additional details and impacted files ```diff @@ Coverage Diff @@ ## main #4915 +/- ## ========================================== + Coverage 62.18% 62.19% +0.01% ========================================== Files 201 201 Lines 16878 16878 ========================================== + Hits 10495 10497 +2 + Misses 5593 5591 -2 Partials 790 790 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

mboersma commented 3 months ago

/cherry-pick release-1.15

k8s-infra-cherrypick-robot commented 3 months ago

@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](https://github.com/kubernetes-sigs/cluster-api-provider-azure/pull/4915#issuecomment-2161434539): >/cherry-pick release-1.15 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
k8s-ci-robot commented 3 months ago

LGTM label has been added.

Git tree hash: dc0d8272f9a7f533056be838c78739303bf986de

k8s-ci-robot commented 3 months ago

[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: - ~~[OWNERS](https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/main/OWNERS)~~ [nojnhuh] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
nojnhuh commented 3 months ago

known flake #4264 /retest

k8s-infra-cherrypick-robot commented 3 months ago

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

Applying: Bump CAPI to v1.7.3
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.3
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](https://github.com/kubernetes-sigs/cluster-api-provider-azure/pull/4915#issuecomment-2161434539): >/cherry-pick release-1.15 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.