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.8 #5371

Merged
merged 2 commits into from
Jan 16, 2025
Merged

Bump CAPI to v1.8.8 #5371

merged 2 commits into from
Jan 16, 2025

Conversation

willie-yao
Copy link
Contributor

@willie-yao willie-yao commented Jan 15, 2025 •
edited by mboersma
Loading

What type of PR is this?
/kind cleanup

What this PR does / why we need it:
This PR bumps CAPI to v1.8.8 and includes a fix that removes identity: SystemAssigned from the mp upgrade templates, which were leftover from an old template. Current prow mp templates do not set identity: SystemAssigned

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Closes #5356
Closes #5331

Special notes for your reviewer:

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests
  • cherry-pick candidate

Release note:

Bump CAPI to v1.8.8

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 15, 2025
@willie-yao
Copy link
Contributor Author

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

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 15, 2025
@codecov Codecov
Copy link

codecov bot commented Jan 15, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 52.43%. Comparing base (71a3924) to head (3571457).
Report is 17 commits behind head on main.

Additional details and impacted files 
@@           Coverage Diff           @@
##             main    #5371   +/-   ##
=======================================
  Coverage   52.43%   52.43%           
=======================================
  Files         272      272           
  Lines       29401    29401           
=======================================
  Hits        15417    15417           
  Misses      13178    13178           
  Partials      806      806

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

@willie-yao
Copy link
Contributor Author

Passed once: https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api-provider-azure/5371/pull-cluster-api-provider-azure-apiversion-upgrade/1879667623705186304

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

@willie-yao willie-yao changed the title [WIP] [DO_NOT_MERGE] Debug CAPI v1.8.x upgrade issue Bump CAPI to v1.8.8 Jan 16, 2025
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. labels Jan 16, 2025
@willie-yao
Copy link
Contributor Author

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

willie-yao
willie-yao commented Jan 16, 2025
View reviewed changes
test/e2e/data/infrastructure-azure/v1beta1/bases/mp.yaml
@@ -29,7 +29,6 @@ metadata:
name: ${CLUSTER_NAME}-mp-0
namespace: default
spec:
identity: SystemAssigned
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This base is leftover from this old PR: https://github.com/kubernetes-sigs/cluster-api-provider-azure/pull/1423/files#diff-64ec3c60700d0c80917da2dc8f447b2cc531a482c32abdef2466c7bb7e9740d7R32

Current prow mp templates do not have this field: https://github.com/willie-yao/cluster-api-provider-azure/blob/357145797da465de3ba5d55f31a6e7d85e71bb7f/templates/cluster-template-machinepool.yaml#L161

@willie-yao
Copy link
Contributor Author

/assign @nawazkh
/assign @mboersma

mboersma
mboersma approved these changes Jan 16, 2025
View reviewed changes
Copy link
Contributor

@mboersma mboersma left a comment

Choose a reason for hiding this comment

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

/lgtm
/cherry-pick release-1.17

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

LGTM label has been added.

Git tree hash: a84f0c7cc22e49a801fca361561bda0cb8715a71

@mboersma
Copy link
Contributor

mboersma commented Jan 16, 2025 •
edited
Loading

/cherry-pick release-1.17

Edit cherry-pick bot is so inflexible! We should improve it so /cherry-pick doesn't have to be the first line and so you could have multiple per comment.

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

@nawazkh
Copy link
Member

nawazkh commented Jan 16, 2025

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nawazkh

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 Jan 16, 2025
@willie-yao
Copy link
Contributor Author

/retest

@nawazkh nawazkh mentioned this pull request Jan 16, 2025
Closed
4 tasks
@k8s-ci-robot k8s-ci-robot merged commit 8b8ba05 into kubernetes-sigs:main Jan 16, 2025
32 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Jan 16, 2025
@k8s-infra-cherrypick-robot
Copy link

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

Applying: Bump CAPI to v1.8.8
Using index info to reconstruct a base tree...
M	Makefile
M	Tiltfile
M	docs/book/src/getting-started.md
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 docs/book/src/getting-started.md
CONFLICT (content): Merge conflict in docs/book/src/getting-started.md
Auto-merging Tiltfile
Auto-merging Makefile
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.8

In response to this:

/cherry-pick release-1.17

Edit cherry-pick bot is so inflexible! We should improve it so /cherry-pick doesn't have to be the first line and so you could have multiple per comment.

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.

@nawazkh nawazkh mentioned this pull request Jan 17, 2025
Merged
4 tasks
@willie-yao willie-yao deleted the bump-capi-one-eight branch February 4, 2025 20:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mboersma mboersma mboersma approved these changes

@Jont828 Jont828 Awaiting requested review from Jont828

@jsturtevant jsturtevant Awaiting requested review from jsturtevant

Assignees

@mboersma mboersma

@nawazkh nawazkh

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/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. 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.
5 participants
@willie-yao @k8s-ci-robot @mboersma @k8s-infra-cherrypick-robot @nawazkh