Skip to content

Conversation

nojnhuh
Copy link
Contributor

@nojnhuh nojnhuh commented Oct 23, 2025

What type of PR is this?
/kind bug

What this PR does / why we need it:

Manual cherry-pick of #5930:

This PR fixes a regression caused by #5780 which didn't account for the possibility that user assigned identity IDs in CAPZ templates can be prefixed with azure://.

This PR also updates all of our reference and test templates to use the azure:// prefix since it's documented that way in the API: https://capz.sigs.k8s.io/reference/v1beta1-api#UserAssignedIdentity

With the same caveat as #5932:

This PR doesn't make the template changes as widely as the original PR. I reverted all of the changes to the templates/flavors directory to avoid any unnecessary churn there, and those changes matriculated to some of the test templates. I think there's about a 50/50 split in the test templates that use the azure:// prefix in user-assigned identity IDs and those that don't. I could try to make more of the test templates use the prefix but that effort doesn't seem worthwhile.

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

Special notes for your reviewer:

TODOs:

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

Release note:

Fixed a regression where user-assigned identities with IDs prefixed with `azure://` for AzureMachines were misidentified as missing.

@k8s-ci-robot k8s-ci-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Oct 23, 2025
@k8s-ci-robot k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Oct 23, 2025
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 23, 2025
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 23, 2025
@codecov
Copy link

codecov bot commented Oct 23, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 52.81%. Comparing base (b8f62ac) to head (5e557bf).
⚠️ Report is 6 commits behind head on release-1.20.

Additional details and impacted files
@@              Coverage Diff              @@
##           release-1.20    #5937   +/-   ##
=============================================
  Coverage         52.80%   52.81%           
=============================================
  Files               279      279           
  Lines             29602    29602           
=============================================
+ Hits              15632    15634    +2     
+ Misses            13156    13154    -2     
  Partials            814      814           

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@nojnhuh
Copy link
Contributor Author

nojnhuh commented Oct 23, 2025

Bootstrap flake

/retest

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
/approve

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

LGTM label has been added.

Git tree hash: 4ae8356f9ad13bc8ef96e7836e5722ffe9a6e4a7

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mboersma

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 Oct 23, 2025
@k8s-ci-robot k8s-ci-robot merged commit f9b0eaa into kubernetes-sigs:release-1.20 Oct 23, 2025
22 checks passed
@github-project-automation github-project-automation bot moved this from Todo to Done in CAPZ Planning Oct 23, 2025
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/bug Categorizes issue or PR as related to a bug. 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

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants