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

Update CAPI to v1.4.3 #3612

Merged
merged 1 commit into from
Jun 15, 2023

Conversation

mboersma
Copy link
Contributor

@mboersma mboersma commented Jun 7, 2023

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Updates CAPI references to use the v1.4.3 release. Also bumps cert-manager to v1.12.1 to match CAPI. Reimplements some trivial string processing methods that were deprecated in CAPI.

Which issue(s) this PR fixes:

Closes #3613

Special notes for your reviewer:

  • cherry-pick candidate

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

Update CAPI to v1.4.3

@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. labels Jun 7, 2023
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 7, 2023
@mboersma mboersma force-pushed the capi-one-four-three branch 3 times, most recently from ebbeb7a to 2c982d3 Compare June 7, 2023 18:04
@codecov
Copy link

codecov bot commented Jun 7, 2023

Codecov Report

Patch coverage: 14.28% and project coverage change: -0.37 ⚠️

Comparison is base (dda6638) 53.58% compared to head (f043321) 53.21%.

❗ Current head f043321 differs from pull request most recent head 2864560. Consider uploading reports for the commit 2864560 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3612      +/-   ##
==========================================
- Coverage   53.58%   53.21%   -0.37%     
==========================================
  Files         185      185              
  Lines       18552    18431     -121     
==========================================
- Hits         9941     9808     -133     
- Misses       8069     8081      +12     
  Partials      542      542              
Impacted Files Coverage Δ
azure/scope/machinepool.go 31.41% <0.00%> (+0.23%) ⬆️
util/azure/azure.go 22.78% <0.00%> (-3.69%) ⬇️
azure/scope/machine.go 50.71% <100.00%> (-0.80%) ⬇️

... and 12 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@mboersma mboersma force-pushed the capi-one-four-three branch from f043321 to 70174fa Compare June 7, 2023 21:29
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 7, 2023
@kubernetes-sigs kubernetes-sigs deleted a comment from k8s-ci-robot Jun 7, 2023
@mboersma mboersma force-pushed the capi-one-four-three branch from 70174fa to 947cf35 Compare June 9, 2023 01:39
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 9, 2023
@mboersma mboersma force-pushed the capi-one-four-three branch 2 times, most recently from 36d25ba to 69dad47 Compare June 9, 2023 19:46
@mboersma
Copy link
Contributor Author

/hold

Let's rebase this after #3616 merges, so it doesn't duplicate code.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 12, 2023
@mboersma mboersma force-pushed the capi-one-four-three branch from 69dad47 to 8538e3d Compare June 13, 2023 21:23
@mboersma
Copy link
Contributor Author

/hold cancel
/cherry-pick release-1.9

@k8s-infra-cherrypick-robot

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

In response to this:

/hold cancel
/cherry-pick release-1.9

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.

@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 Jun 13, 2023
@mboersma mboersma force-pushed the capi-one-four-three branch from 8538e3d to 5ac35ee Compare June 14, 2023 16:26
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 14, 2023
Copy link
Contributor

@jackfrancis jackfrancis 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 Jun 15, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 5c938112c57a7f5a0fc20ac6d9914d8f20715de3

@mboersma
Copy link
Contributor Author

/milestone v1.10

@k8s-ci-robot k8s-ci-robot added this to the v1.10 milestone Jun 15, 2023
@mboersma mboersma force-pushed the capi-one-four-three branch from 5ac35ee to 2864560 Compare June 15, 2023 17:37
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 15, 2023
@k8s-ci-robot k8s-ci-robot requested a review from jackfrancis June 15, 2023 17:37
@mboersma
Copy link
Contributor Author

/retest pull-cluster-api-provider-azure-e2e

docker pull docker.io/library/golang:1.20
1.20: Pulling from library/golang
received unexpected HTTP status: 503 Service Unavailable
make[1]: *** [Makefile:374: docker-pull-prerequisites] Error 1

@mboersma
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-e2e

@CecileRobertMichon
Copy link
Contributor

/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 Jun 15, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 4141d180d8709f86c0d441a443f5e8b6593c0df2

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon

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 Jun 15, 2023
@k8s-ci-robot k8s-ci-robot merged commit c4e06af into kubernetes-sigs:main Jun 15, 2023
@k8s-infra-cherrypick-robot

@mboersma: #3612 failed to apply on top of branch "release-1.9":

Applying: Update CAPI to v1.4.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
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 Update CAPI to v1.4.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:

/hold cancel
/cherry-pick release-1.9

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.

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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants