Skip to content

Conversation

@nojnhuh
Copy link
Contributor

@nojnhuh nojnhuh commented Aug 21, 2025

What type of PR is this?
/kind feature

What this PR does / why we need it:

The last two bumps to ASO in go.mod in #5517 and #5428 didn't also update the version of ASO that gets installed alongside CAPZ which we generally try to keep in sync (e.g. #5170). This PR adds a mechanism to derive the ASO version used for the manifest fed to kustomize from go.mod. This means dependabot PRs for ASO should now generally do the right thing and we only need to exercise the normal amount of care with those (checking changelogs, fixing compile failures, etc.).

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:

TODOs:

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

Release note:

The version of ASO installed with CAPZ is now v2.13.0.

@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/feature Categorizes issue or PR as related to a new feature. labels Aug 21, 2025
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Aug 21, 2025
Comment on lines +5 to +6
# The ASO version here is managed by `make generate-aso-crds`
- https://github.com/Azure/azure-service-operator/releases/download/v2.13.0/azureserviceoperator_v2.13.0.yaml
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The changes to this file are entirely whitespace as a consequence of being fed through yq, with the exception of the intended bump to the version and this new comment.

RBAC_ROOT ?= $(MANIFEST_ROOT)/rbac
ASO_CRDS_PATH := $(MANIFEST_ROOT)/aso/crds.yaml
ASO_VERSION := v2.11.0
ASO_VERSION := $(shell go list -m -f '{{ .Version }}' github.com/Azure/azure-service-operator/v2)
Copy link
Contributor

Choose a reason for hiding this comment

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

🥳

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

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

LGTM label has been added.

Git tree hash: af19955e10cd301b3611968705d507c6523ccf04

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jackfrancis

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 Aug 21, 2025
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Aug 21, 2025

I don't think we need to backport this. AFAIK CAPZ isn't taking advantage of any new features from newer ASO libraries that aren't implemented in older running ASO instances. Bumping ASO in a patch release might also be disruptive.

@nojnhuh
Copy link
Contributor Author

nojnhuh commented Aug 21, 2025

/retest

@codecov
Copy link

codecov bot commented Aug 21, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 46.94%. Comparing base (4ad8f96) to head (89962ba).
⚠️ Report is 8 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #5832   +/-   ##
=======================================
  Coverage   46.94%   46.94%           
=======================================
  Files         279      279           
  Lines       29687    29687           
=======================================
  Hits        13936    13936           
  Misses      14938    14938           
  Partials      813      813           

☔ 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 Aug 25, 2025

/retest

@k8s-ci-robot k8s-ci-robot merged commit d374fcb into kubernetes-sigs:main Aug 25, 2025
25 of 28 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Aug 25, 2025
@github-project-automation github-project-automation bot moved this from Todo to Done in CAPZ Planning Aug 25, 2025
@nojnhuh nojnhuh deleted the aso-sync branch August 25, 2025 04:01
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Aug 28, 2025

/milestone v1.22

@k8s-ci-robot k8s-ci-robot modified the milestones: v1.21, v1.22 Aug 28, 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/feature Categorizes issue or PR as related to a new feature. 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants