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

🐛 Restore v1alpha3/v1alpha4 conversion to fix SSA issue #2739

Merged
merged 4 commits into from
Feb 15, 2024
Merged

🐛 Restore v1alpha3/v1alpha4 conversion to fix SSA issue #2739

merged 4 commits into from
Feb 15, 2024

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Feb 14, 2024 •
edited
Loading

What this PR does / why we need it:
For more details see the corresponding issue in core CAPI: kubernetes-sigs/cluster-api#10147

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 #

@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 Feb 14, 2024
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Feb 14, 2024
@sbueringer
Copy link
Member Author

/test ?

@k8s-ci-robot
Copy link
Contributor

@sbueringer: The following commands are available to trigger required jobs:

  • /test pull-cluster-api-provider-vsphere-e2e-blocking-main
  • /test pull-cluster-api-provider-vsphere-e2e-conformance-ci-latest-main
  • /test pull-cluster-api-provider-vsphere-e2e-conformance-main
  • /test pull-cluster-api-provider-vsphere-e2e-main
  • /test pull-cluster-api-provider-vsphere-e2e-upgrade-1-29-1-30-main
  • /test pull-cluster-api-provider-vsphere-test-integration-main
  • /test pull-cluster-api-provider-vsphere-test-main
  • /test pull-cluster-api-provider-vsphere-verify-main

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-provider-vsphere-apidiff-main

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-provider-vsphere-apidiff-main
  • pull-cluster-api-provider-vsphere-e2e-blocking-main
  • pull-cluster-api-provider-vsphere-test-integration-main
  • pull-cluster-api-provider-vsphere-test-main
  • pull-cluster-api-provider-vsphere-verify-main

In response to this:

/test ?

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.

@sbueringer
Copy link
Member Author

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

@sbueringer sbueringer force-pushed the pr-fix-apiversion-issue branch from 833e81c to 3299c63 Compare February 14, 2024 15:19
@codecov Codecov
Copy link

codecov bot commented Feb 14, 2024 •
edited
Loading

Codecov Report

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

Comparison is base (14a4e84) 64.59% compared to head (f16d0be) 64.00%.
Report is 2 commits behind head on main.

Files Patch % Lines
apis/v1alpha3/cloudprovider_encoding.go 75.49% 33 Missing and 4 partials ⚠️
apis/v1alpha3/vsphereclusteridentity_conversion.go 0.00% 18 Missing ⚠️
apis/v1alpha3/vspherecluster_conversion.go 50.00% 12 Missing and 3 partials ⚠️
apis/v1alpha3/vspheremachine_conversion.go 55.88% 12 Missing and 3 partials ⚠️
apis/v1alpha3/vspheremachinetemplate_conversion.go 72.22% 12 Missing and 3 partials ⚠️
apis/v1alpha3/vspherevm_conversion.go 57.14% 12 Missing and 3 partials ⚠️
apis/v1alpha4/vspheremachine_conversion.go 57.14% 12 Missing and 3 partials ⚠️
apis/v1alpha4/vspheremachinetemplate_conversion.go 70.00% 12 Missing and 3 partials ⚠️
apis/v1alpha4/vspherevm_conversion.go 57.14% 12 Missing and 3 partials ⚠️
apis/v1alpha3/vspheredeploymentzone_conversion.go 0.00% 12 Missing ⚠️
... and 21 more
Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #2739      +/-   ##
==========================================
- Coverage   64.59%   64.00%   -0.59%     
==========================================
  Files         119      160      +41     
  Lines        8640     9338     +698     
==========================================
+ Hits         5581     5977     +396     
- Misses       2627     2904     +277     
- Partials      432      457      +25

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

@sbueringer sbueringer force-pushed the pr-fix-apiversion-issue branch from 3299c63 to 9a0f13d Compare February 14, 2024 15:35
@sbueringer
Copy link
Member Author

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

@sbueringer
Copy link
Member Author

Tested the following locally:

  • make tilt-up
  • Deploy a cluster with the external-loadbalancer template
  • Modify managed fields to add an entry with v1alpha3 via `kubectl apply /tmp/vspheremachinetemplate.yaml --server-side=false"
  • Verified conversion webhook is called and it works when running `kubectl apply /tmp/vspheremachinetemplate.yaml --server-side=true"

So I would conclude that conversion works again and we can handle v1alpha3 entries in managedFields.

Additionally we have conversion fuzz-tests for all apiVersions now.

@sbueringer sbueringer changed the title [WIP] 🌱 Restore v1alpha3 / v1alpha4 🐛 Restore v1alpha3/v1alpha4 conversion to fix SSA issue Feb 14, 2024
@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 Feb 14, 2024
@sbueringer sbueringer mentioned this pull request Feb 14, 2024
Merged
@chrischdi
Copy link
Member

chrischdi commented Feb 15, 2024 •
edited
Loading

/lgtm
/approve

/hold
so you can take it off

Do we need an issue to track again the final removal? (maybe when only k8s versions are supported which have the k/k fix)

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

LGTM label has been added.

Git tree hash: 19450088d543b9505cdf9589d94ba1b41fa48be6

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 15, 2024
@sbueringer
Copy link
Member Author

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

@fabriziopandini
Copy link
Member

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi, fabriziopandini

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 [chrischdi,fabriziopandini]

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

@sbueringer
Copy link
Member Author

/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 Feb 15, 2024
@sbueringer sbueringer force-pushed the pr-fix-apiversion-issue branch from 9a0f13d to f16d0be Compare February 15, 2024 10:22
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 15, 2024
@sbueringer
Copy link
Member Author

/test pull-cluster-api-provider-vsphere-e2e-blocking-main
/test pull-cluster-api-provider-vsphere-test-integration-main
/test pull-cluster-api-provider-vsphere-test-main
/test pull-cluster-api-provider-vsphere-verify-main

@chrischdi
Copy link
Member

/retest

/lgtm

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

LGTM label has been added.

Git tree hash: 4ffb1f835f485d4108fba305cb8dfca0ba3dd847

@k8s-ci-robot k8s-ci-robot merged commit 091f636 into kubernetes-sigs:main Feb 15, 2024
17 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.10 milestone Feb 15, 2024
@sbueringer sbueringer deleted the pr-fix-apiversion-issue branch February 15, 2024 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@laozc laozc Awaiting requested review from laozc

@MaxRink MaxRink Awaiting requested review from MaxRink

@chrischdi chrischdi Awaiting requested review from chrischdi

@fabriziopandini fabriziopandini Awaiting requested review from fabriziopandini

Assignees

@chrischdi chrischdi

@fabriziopandini fabriziopandini

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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v1.10
Development

Successfully merging this pull request may close these issues.
4 participants
@sbueringer @k8s-ci-robot @chrischdi @fabriziopandini