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

Allow joining AzureMachinePools to AKS clusters #4052

Merged
merged 1 commit into from
Nov 4, 2023
Merged

Allow joining AzureMachinePools to AKS clusters #4052

merged 1 commit into from
Nov 4, 2023

Conversation

CecileRobertMichon
Copy link
Contributor

@CecileRobertMichon CecileRobertMichon commented Sep 28, 2023 •
edited
Loading

What type of PR is this?

What this PR does / why we need it: This allows joining a self-managed Azure VMSS nodepool to a CAPZ managed AKS cluster (AzureManagedControlPlane) for development and testing purposes.

Huge credits go to @alexeldeib for initial idea + POC.

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

Special notes for your reviewer:

  • cherry-pick candidate

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

Allow joining AzureMachinePools to AKS clusters

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Sep 28, 2023
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Sep 28, 2023
CecileRobertMichon
CecileRobertMichon commented Oct 3, 2023
View reviewed changes
Tiltfile Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 4, 2023
@codecov
Copy link

codecov bot commented Oct 4, 2023 •
edited
Loading

Codecov Report

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

Comparison is base (6e074c7) 57.87% compared to head (571efca) 57.93%.
Report is 66 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #4052      +/-   ##
==========================================
+ Coverage   57.87%   57.93%   +0.06%     
==========================================
  Files         187      187              
  Lines       19212    19352     +140     
==========================================
+ Hits        11118    11211      +93     
- Misses       7466     7510      +44     
- Partials      628      631       +3
Files Coverage Δ
api/v1beta1/azuremanagedcontrolplane_types.go 20.00% <ø> (ø)
azure/scope/machinepoolmachine.go 33.94% <100.00%> (ø)
azure/services/groups/groups.go 100.00% <100.00%> (ø)
azure/services/managedclusters/managedclusters.go 55.00% <ø> (ø)
controllers/azurecluster_reconciler.go 58.20% <100.00%> (-1.08%) ⬇️
controllers/azurejson_machinepool_controller.go 44.16% <100.00%> (-6.19%) ⬇️
azure/scope/machinepool.go 36.68% <75.00%> (+7.50%) ⬆️
azure/scope/cluster.go 60.82% <50.00%> (+0.74%) ⬆️
.../controllers/azuremachinepoolmachine_controller.go 40.33% <33.33%> (-2.41%) ⬇️
azure/scope/machine.go 50.00% <69.23%> (ø)
... and 6 more

... and 11 files with indirect coverage changes

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

@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-e2e-aks

@CecileRobertMichon CecileRobertMichon mentioned this pull request Oct 6, 2023
Merged
4 tasks
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 9, 2023
@k8s-ci-robot
Copy link
Contributor

PR needs rebase.

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.

4 similar comments
@k8s-ci-robot
Copy link
Contributor

PR needs rebase.

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.

@k8s-ci-robot
Copy link
Contributor

PR needs rebase.

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.

@k8s-ci-robot
Copy link
Contributor

PR needs rebase.

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.

@k8s-ci-robot
Copy link
Contributor

PR needs rebase.

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.

@CecileRobertMichon CecileRobertMichon force-pushed the byo-aks-node branch 3 times, most recently from 8d398cc to 355d085 Compare October 12, 2023 20:52
@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 13, 2023
@k8s-ci-robot
Copy link
Contributor

PR needs rebase.

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.

@codecov Codecov
Copy link

codecov bot commented Nov 3, 2023 •
edited
Loading

Codecov Report

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

Comparison is base (6e074c7) 57.87% compared to head (74a8a2b) 57.93%.
Report is 68 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #4052      +/-   ##
==========================================
+ Coverage   57.87%   57.93%   +0.06%     
==========================================
  Files         187      187              
  Lines       19212    19352     +140     
==========================================
+ Hits        11118    11211      +93     
- Misses       7466     7510      +44     
- Partials      628      631       +3
Files Coverage Δ
api/v1beta1/azuremanagedcontrolplane_types.go 20.00% <ø> (ø)
azure/scope/machinepoolmachine.go 33.94% <100.00%> (ø)
azure/services/groups/groups.go 100.00% <100.00%> (ø)
azure/services/managedclusters/managedclusters.go 55.00% <ø> (ø)
controllers/azurejson_machinepool_controller.go 44.16% <100.00%> (-6.19%) ⬇️
azure/scope/machinepool.go 36.68% <75.00%> (+7.50%) ⬆️
controllers/azurecluster_reconciler.go 59.28% <83.33%> (ø)
azure/scope/cluster.go 60.82% <50.00%> (+0.74%) ⬆️
.../controllers/azuremachinepoolmachine_controller.go 40.33% <33.33%> (-2.41%) ⬇️
azure/scope/machine.go 50.00% <69.23%> (ø)
... and 6 more

... and 11 files with indirect coverage changes

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

nojnhuh
nojnhuh reviewed Nov 3, 2023
View reviewed changes
Copy link
Contributor

@nojnhuh nojnhuh left a comment

Choose a reason for hiding this comment

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

/lgtm

🪄🪄🪄

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

LGTM label has been added.

Git tree hash: 62494414e6f9eed76d8c3be6d9cff233b27f2ade

@CecileRobertMichon
Copy link
Contributor Author

/assign @jackfrancis @willie-yao

jackfrancis
jackfrancis approved these changes Nov 3, 2023
View reviewed changes
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.

added some comments, pending responses lgtm

great work @CecileRobertMichon!

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

Thanks @jackfrancis! addressed your comments

@k8s-ci-robot
Copy link
Contributor

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

@CecileRobertMichon: 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-apidiff 74a8a2b link false /test pull-cluster-api-provider-azure-apidiff

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

/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 Nov 3, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 639bde32dd8f7471320a6653503a24433f0ef982

@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 Nov 3, 2023
@nojnhuh
Copy link
Contributor

nojnhuh commented Nov 4, 2023

/test pull-cluster-api-provider-azure-e2e-aks

@k8s-ci-robot k8s-ci-robot merged commit b81d0c7 into kubernetes-sigs:main Nov 4, 2023
28 of 29 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.12 milestone Nov 4, 2023
@nojnhuh nojnhuh mentioned this pull request Oct 15, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jont828 Jont828 Awaiting requested review from Jont828

@jackfrancis jackfrancis Awaiting requested review from jackfrancis

@nawazkh nawazkh Awaiting requested review from nawazkh

@nojnhuh nojnhuh Awaiting requested review from nojnhuh

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

Assignees

@jackfrancis jackfrancis

@nojnhuh nojnhuh

@nawazkh nawazkh

@willie-yao willie-yao

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

Integrate AzureMachine with AzureManagedControlPlane (BYO nodes on AKS)
7 participants
@CecileRobertMichon @k8s-ci-robot @jsturtevant @jackfrancis @nojnhuh @willie-yao @nawazkh