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

convert managedclusters and agentpools to ASO #4069

Merged
merged 1 commit into from
Nov 15, 2023
Merged

convert managedclusters and agentpools to ASO #4069

merged 1 commit into from
Nov 15, 2023

Conversation

nojnhuh
Copy link
Contributor

@nojnhuh nojnhuh commented Oct 3, 2023 •
edited
Loading

What type of PR is this?
/kind cleanup

What this PR does / why we need it: This PR updates the managedclusters and agentpools services to use ASO.

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 #3529

Special notes for your reviewer:

  • cherry-pick candidate

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

/hold for squash, ASO v2.4 (#4248)

Release note:

ASO now manages managed clusters and agent pools. Custom headers no longer have any effect.

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. 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 Oct 3, 2023
nojnhuh
nojnhuh commented Oct 3, 2023
View reviewed changes
api/v1beta1/azuremanagedcluster_webhook.go Show resolved Hide resolved
azure/services/agentpools/spec.go Show resolved Hide resolved
azure/services/agentpools/spec.go Show resolved Hide resolved
azure/services/aso/aso.go Outdated Show resolved Hide resolved
azure/services/aso/tags.go Outdated Show resolved Hide resolved
azure/services/managedclusters/managedclusters.go Outdated Show resolved Hide resolved
test/e2e/aks_tags.go Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Oct 3, 2023 •
edited
Loading

Codecov Report

Attention: 67 lines in your changes are missing coverage. Please review.

Comparison is base (16170b7) 57.95% compared to head (468dda3) 59.21%.
Report is 24 commits behind head on main.

Files Patch % Lines
azure/services/managedclusters/spec.go 84.45% 21 Missing and 2 partials ⚠️
azure/services/managedclusters/managedclusters.go 79.68% 12 Missing and 1 partial ⚠️
azure/services/agentpools/spec.go 87.34% 10 Missing ⚠️
azure/scope/managedmachinepool.go 50.00% 9 Missing ⚠️
azure/services/agentpools/agentpools.go 60.00% 6 Missing ⚠️
controllers/azuremanagedmachinepool_reconciler.go 33.33% 3 Missing and 1 partial ⚠️
azure/scope/managedcontrolplane.go 71.42% 2 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #4069      +/-   ##
==========================================
+ Coverage   57.95%   59.21%   +1.25%     
==========================================
  Files         187      185       -2     
  Lines       19357    18778     -579     
==========================================
- Hits        11219    11119     -100     
+ Misses       7507     7050     -457     
+ Partials      631      609      -22

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

@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Oct 3, 2023
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Oct 6, 2023

/area managedclusters

@k8s-ci-robot k8s-ci-robot added the area/managedclusters Issues related to managed AKS clusters created through the CAPZ ManagedCluster Type label Oct 6, 2023
@dtzar dtzar mentioned this pull request Oct 10, 2023
Closed
@CecileRobertMichon CecileRobertMichon mentioned this pull request Oct 11, 2023
Merged
4 tasks
@nojnhuh nojnhuh mentioned this pull request Oct 13, 2023
Closed
@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Oct 14, 2023
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Oct 16, 2023

/retest

willie-yao
willie-yao reviewed Oct 16, 2023
View reviewed changes
Copy link
Contributor

@willie-yao willie-yao left a comment

Choose a reason for hiding this comment

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

Just a few comments on my end, mostly clarifying questions and nits! Great work on this 🚀

Makefile Show resolved Hide resolved
api/v1beta1/azuremanagedcluster_webhook.go Show resolved Hide resolved
api/v1beta1/azuremanagedcontrolplane_webhook.go Outdated Show resolved Hide resolved
api/v1beta1/azuremanagedmachinepool_webhook.go Show resolved Hide resolved
azure/services/agentpools/spec.go Show resolved Hide resolved
@mboersma mboersma mentioned this pull request Oct 16, 2023
Closed
4 tasks
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Oct 16, 2023

/retest

@nawazkh
Copy link
Member

nawazkh commented Oct 17, 2023

/assign

@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Nov 7, 2023
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 9, 2023

/retest

1 similar comment
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 11, 2023

/retest

@nojnhuh nojnhuh mentioned this pull request Nov 11, 2023
Merged
4 tasks
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 11, 2023

/retest

1 similar comment
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 12, 2023

/retest

@CecileRobertMichon
Copy link
Contributor

/lgtm
/approve
/hold for #4248

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

LGTM label has been added.

Git tree hash: afc2c054ded622fb052ea19a1a1f9a4132706a62

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 13, 2023
@nojnhuh nojnhuh force-pushed the aso-managedclusters branch from 75a8990 to 468dda3 Compare November 13, 2023 23:34
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 14, 2023

/retest

1 similar comment
@CecileRobertMichon
Copy link
Contributor

/retest

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Nov 14, 2023 •
edited
Loading

@nojnhuh: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-provider-azure-windows-containerd-upstream-custom-builds acd37a9 link false /test pull-cluster-api-provider-azure-windows-containerd-upstream-custom-builds

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@jackfrancis
Copy link
Contributor

/hold cancel

@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 Nov 15, 2023
@jackfrancis
Copy link
Contributor

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon, 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:
  • OWNERS [CecileRobertMichon,jackfrancis]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@CecileRobertMichon
Copy link
Contributor

/retest

@k8s-ci-robot k8s-ci-robot merged commit d586453 into kubernetes-sigs:main Nov 15, 2023
29 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.12 milestone Nov 15, 2023
@CecileRobertMichon CecileRobertMichon mentioned this pull request Nov 15, 2023
Merged
4 tasks
@nojnhuh nojnhuh mentioned this pull request Nov 20, 2023
Merged
4 tasks
@nojnhuh nojnhuh deleted the aso-managedclusters branch November 21, 2023 01:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LochanRn LochanRn LochanRn left review comments

@CecileRobertMichon CecileRobertMichon CecileRobertMichon left review comments

@dtzar dtzar dtzar left review comments

@jackfrancis jackfrancis jackfrancis approved these changes

@Jont828 Jont828 Awaiting requested review from Jont828

@marosset marosset Awaiting requested review from marosset

@nawazkh nawazkh Awaiting requested review from nawazkh

@willie-yao willie-yao Awaiting requested review from willie-yao

Assignees

@jackfrancis jackfrancis

@CecileRobertMichon CecileRobertMichon

@nawazkh nawazkh

@willie-yao willie-yao

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/managedclusters Issues related to managed AKS clusters created through the CAPZ ManagedCluster Type 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
CAPZ Planning
Archived in project
Milestone
v1.12
Development

Successfully merging this pull request may close these issues.

ASO service: managedclusters and agentpools
9 participants
@nojnhuh @nawazkh @jackfrancis @k8s-ci-robot @willie-yao @CecileRobertMichon @dtzar @Jont828 @LochanRn