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

[release-1.12] only consider spec in existing when reconciling ASO tags #4540

Merged
merged 1 commit into from
Feb 6, 2024

Conversation

nojnhuh
Copy link
Contributor

@nojnhuh nojnhuh commented Feb 6, 2024

What type of PR is this?
/kind bug

What this PR does / why we need it:

Manual cherry-pick of #4531:

This PR offers an alternative fix to the issue addressed by #4149 which fixes the regression described by #4525. It eliminates CAPZ's use of ASO resources' status.tags from its reconciliation of tags in favor of only considering spec.tags which is easier to synchronize with CAPZ's extra bookkeeping in the last-applied-tags annotation.

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

Special notes for your reviewer:

  • cherry-pick candidate

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

Fixed a bug where tags applied by Azure Policy were keeping CAPZ from reconciling ASO ResourceGroups and ManagedClusters

@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/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 6, 2024
Copy link

codecov bot commented Feb 6, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (f82a7a8) 59.76% compared to head (de1098e) 59.75%.
Report is 3 commits behind head on release-1.12.

Additional details and impacted files
@@               Coverage Diff                @@
##           release-1.12    #4540      +/-   ##
================================================
- Coverage         59.76%   59.75%   -0.02%     
================================================
  Files               192      192              
  Lines             19316    19300      -16     
================================================
- Hits              11544    11532      -12     
+ Misses             7143     7139       -4     
  Partials            629      629              

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

@nawazkh
Copy link
Member

nawazkh commented Feb 6, 2024

/lgtm

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

LGTM label has been added.

Git tree hash: 546facc894d5acd877ac8b134bb1816a6d2eb1a7

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
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 Feb 6, 2024
@k8s-ci-robot k8s-ci-robot merged commit a22366f into kubernetes-sigs:release-1.12 Feb 6, 2024
18 checks passed
@nojnhuh nojnhuh deleted the aso-tags-1.12 branch February 14, 2024 20:21
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
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants