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

🌱 Get rid of unstructured type in VSphereVM reconciler #2353

Merged
merged 1 commit into from
Sep 18, 2023
Merged

🌱 Get rid of unstructured type in VSphereVM reconciler #2353

merged 1 commit into from
Sep 18, 2023

Conversation

zhanggbj
Copy link
Contributor

@zhanggbj zhanggbj commented Sep 14, 2023 •
edited
Loading

What this PR does / why we need it:

I'm assuming this is an intermediate state when to support supervisor mode, so it uses unstructured type in VSphereVM reconciler to support two modes. As we now have vmoperator to reconcile VM in supervisor mode, I think we are good to get rid of unstructured type in VSphereVM reconciler, but better to have a review from folks who're more familiar with supervisor mode.

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

@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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 14, 2023
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 14, 2023
@codecov
Copy link

codecov bot commented Sep 14, 2023 •
edited
Loading

Codecov Report

Patch coverage: 7.31% and project coverage change: +0.49% 🎉

Comparison is base (21665a2) 60.23% compared to head (c7d13ec) 60.73%.
Report is 6 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #2353      +/-   ##
==========================================
+ Coverage   60.23%   60.73%   +0.49%     
==========================================
  Files         164      164              
  Lines        9439     9392      -47     
==========================================
+ Hits         5686     5704      +18     
+ Misses       3334     3277      -57     
+ Partials      419      411       -8
Files Changed Coverage Δ
pkg/services/vimmachine.go 61.40% <7.31%> (+9.61%) ⬆️

... and 10 files with indirect coverage changes

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

@zhanggbj zhanggbj changed the title [WIP] 🌱 Get rid of unstructured type in VSphereVM reconciler 🌱 Get rid of unstructured type in VSphereVM reconciler Sep 15, 2023
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 15, 2023
sbueringer
sbueringer reviewed Sep 15, 2023
View reviewed changes
Copy link
Member

@sbueringer sbueringer left a comment

Choose a reason for hiding this comment

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

Really nice cleanup. One nit.

Let's ignore the non-ideal logs for now (that we already had before this PR), we'll improve that when we improve logging of the entire controller

pkg/services/vimmachine.go Outdated Show resolved Hide resolved
@zhanggbj
Copy link
Contributor Author

@sbueringer all comments are addressed, it's ready for a second look, thx!

@sbueringer
Copy link
Member

Thx!

/lgtm

/hold
Just want to merge #2352 before

@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 Sep 18, 2023
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 18, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: ffeec6b3b13925d75d6a707ed6ab4c552a2c2bea

@sbueringer
Copy link
Member

/hold cancel
Ah nope we should be good. No overlap

@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 Sep 18, 2023
@sbueringer
Copy link
Member

/test pull-cluster-api-provider-vsphere-e2e-full-main

@kubernetes-sigs kubernetes-sigs deleted a comment from k8s-ci-robot Sep 18, 2023
@chrischdi
Copy link
Member

Very nice cleanup

/approve

/hold pending CI

@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 Sep 18, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi

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 Sep 18, 2023
@sbueringer
Copy link
Member

sbueringer commented Sep 18, 2023 •
edited
Loading

Entirely up to you, but e2e-full automatically blocks merging as soon as it's triggered so we don't have to manage the hold manually (Just fyi)

@chrischdi
Copy link
Member

Entirely up to you, but e2e-full automatically blocks merging as soon as it's triggered so we don't have to manage the hold manually (Just fyi)

Ah right, this was recently changed :-)

/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 Sep 18, 2023
@sbueringer
Copy link
Member

Not really :D. We always had this in CAPV (since before we took over). We just changed it in core CAPI to be the same.

killianmuldoon
killianmuldoon reviewed Sep 18, 2023
View reviewed changes
Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

/retest

@k8s-ci-robot k8s-ci-robot merged commit c2dd905 into kubernetes-sigs:main Sep 18, 2023
12 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.9 milestone Sep 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@killianmuldoon killianmuldoon killianmuldoon left review comments

@sbueringer sbueringer sbueringer left review comments

@gab-satchi gab-satchi Awaiting requested review from gab-satchi

@srm09 srm09 Awaiting requested review from srm09

Assignees

@sbueringer sbueringer

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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.9
Development

Successfully merging this pull request may close these issues.

Consider using VSphereVM instead of unstructured in VimMachineService.ReconcileNormal
5 participants
@zhanggbj @sbueringer @k8s-ci-robot @chrischdi @killianmuldoon