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 bastionhosts to ASO #4143

Merged
merged 1 commit into from
Nov 29, 2023
Merged

Convert bastionhosts to ASO #4143

merged 1 commit into from
Nov 29, 2023

Conversation

willie-yao
Copy link
Contributor

What type of PR is this?
/kind cleanup

What this PR does / why we need it:
This PR converts the BastionHosts service to 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 #4085

Special notes for your reviewer:

  • cherry-pick candidate

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

Convert bastionhosts to ASO

@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/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. labels Oct 16, 2023
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 16, 2023
@willie-yao willie-yao force-pushed the aso-bastionhosts branch 3 times, most recently from f1863ef to 831ac19 Compare October 16, 2023 23:09
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 17, 2023
Jont828
Jont828 reviewed Oct 18, 2023
View reviewed changes
Copy link
Contributor

@Jont828 Jont828 left a comment

Choose a reason for hiding this comment

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

Looks good so far! Just a question, otherwise LGTM

azure/scope/cluster.go Show resolved Hide resolved
@Jont828 Jont828 self-assigned this Oct 18, 2023
@willie-yao
Copy link
Contributor Author

Looks good so far! Just a question, otherwise LGTM

Thanks for the review! I'm still trying to fix up some test errors, so it'll be on hold before I can fix it.

@codecov
Copy link

codecov bot commented Oct 19, 2023 •
edited
Loading

Codecov Report

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

Comparison is base (68a77a5) 59.74% compared to head (f4a0928) 59.88%.
Report is 14 commits behind head on main.

Files Patch % Lines
azure/services/bastionhosts/spec.go 77.77% 10 Missing ⚠️
azure/services/bastionhosts/bastionhosts.go 0.00% 7 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #4143      +/-   ##
==========================================
+ Coverage   59.74%   59.88%   +0.14%     
==========================================
  Files         192      191       -1     
  Lines       19299    19202      -97     
==========================================
- Hits        11531    11500      -31     
+ Misses       7137     7072      -65     
+ Partials      631      630       -1

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

@willie-yao
Copy link
Contributor Author

/retest

@willie-yao
Copy link
Contributor Author

willie-yao commented Oct 20, 2023 •
edited
Loading

Thanks for the review! I'm still trying to fix up some test errors, so it'll be on hold before I can fix it.

Fixed! @nojnhuh @Jont828

@nojnhuh
Copy link
Contributor

nojnhuh commented Oct 23, 2023

/assign @nawazkh

nawazkh
nawazkh reviewed Oct 25, 2023
View reviewed changes
Copy link
Member

@nawazkh nawazkh left a comment

Choose a reason for hiding this comment

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

Some thoughts and comments from first review.
Thanks for putting it together @willie-yao !

azure/services/bastionhosts/bastionhosts.go Show resolved Hide resolved
azure/services/bastionhosts/spec.go Outdated Show resolved Hide resolved
azure/services/bastionhosts/spec.go Show resolved Hide resolved
controllers/azurecluster_controller.go Outdated Show resolved Hide resolved
@nojnhuh
Copy link
Contributor

nojnhuh commented Oct 26, 2023

/hold for squash

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 26, 2023
@willie-yao
Copy link
Contributor Author

@nawazkh Bumping this comment in case you missed it. The prior implementation returned before setting defaults. Wouldn't this cause some fields to be populated with empty data rather than just keeping them nil? #4143 (comment)

@Jont828
Copy link
Contributor

Jont828 commented Oct 31, 2023

@willie-yao Looks like you got a unit test failure. Seems like it has to do with expecting the IP config and the tags to be nil in the result.

@nawazkh
Copy link
Member

nawazkh commented Oct 31, 2023

@nawazkh Bumping this comment in case you missed it. The prior implementation returned before setting defaults. Wouldn't this cause some fields to be populated with empty data rather than just keeping them nil? #4143 (comment)

Replied on the thread @ #4143 (comment)

@willie-yao
Copy link
Contributor Author

/retest

1 similar comment
@nojnhuh
Copy link
Contributor

nojnhuh commented Nov 9, 2023

/retest

@CecileRobertMichon
Copy link
Contributor

This one is ready for rebase @willie-yao

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 16, 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.

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 27, 2023
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 27, 2023
@nojnhuh
Copy link
Contributor

nojnhuh commented Nov 27, 2023

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

@willie-yao
Copy link
Contributor Author

/retest

nojnhuh
nojnhuh reviewed Nov 28, 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 28, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 01bd136b10ece79b441bea695ad33d87d8a29b30

@willie-yao
Copy link
Contributor Author

/retest

@k8s-ci-robot
Copy link
Contributor

@willie-yao: 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-e2e-optional f4a0928 link false /test pull-cluster-api-provider-azure-e2e-optional

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.

@willie-yao
Copy link
Contributor Author

willie-yao commented Nov 28, 2023 •
edited
Loading

The failing test is a known issue with the Flatcar test, tracked in #4317

mboersma
mboersma approved these changes Nov 29, 2023
View reviewed changes
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 Nov 29, 2023
@nojnhuh
Copy link
Contributor

nojnhuh commented Nov 29, 2023

Thank you @willie-yao for squashing!
/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 29, 2023
@k8s-ci-robot k8s-ci-robot merged commit 82786b8 into kubernetes-sigs:main Nov 29, 2023
28 of 29 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.13 milestone Nov 29, 2023
@nojnhuh nojnhuh mentioned this pull request Dec 13, 2023
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nojnhuh nojnhuh nojnhuh left review comments

@mboersma mboersma mboersma approved these changes

@jackfrancis jackfrancis Awaiting requested review from jackfrancis

@Jont828 Jont828 Awaiting requested review from Jont828

@nawazkh nawazkh Awaiting requested review from nawazkh

Assignees

@mboersma mboersma

@nojnhuh nojnhuh

@Jont828 Jont828

@nawazkh nawazkh

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/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.13
Development

Successfully merging this pull request may close these issues.

ASO service: bastionhosts
7 participants
@willie-yao @nojnhuh @Jont828 @nawazkh @k8s-ci-robot @CecileRobertMichon @mboersma