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

SPLAT-1808: Add vSphere multi disk support #2028

Merged
merged 1 commit into from
Jan 8, 2025
Merged

SPLAT-1808: Add vSphere multi disk support #2028

merged 1 commit into from
Jan 8, 2025
+174 −1

Conversation

vr4manta
Copy link
Contributor

@vr4manta vr4manta commented Sep 16, 2024 •
edited
Loading

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 16, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Sep 16, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Sep 16, 2024

Hello @vr4manta! Some important instructions when contributing to openshift/api:
API design plays an important part in the user experience of OpenShift and as such API PRs are subject to a high level of scrutiny to ensure they follow our best practices. If you haven't already done so, please review the OpenShift API Conventions and ensure that your proposed changes are compliant. Following these conventions will help expedite the api review process for your PR.

@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 16, 2024
@vr4manta
Copy link
Contributor Author

/test all

@kannon92
Copy link

Do you have a Jira ticket for this work? I'm trying to research disk support in openshift and this is of interest to me.

@vr4manta
Copy link
Contributor Author

/retest

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 18, 2024
@vr4manta
Copy link
Contributor Author

Do you have a Jira ticket for this work? I'm trying to research disk support in openshift and this is of interest to me.

@kannon92 , We are investigating this as well. I am using our spike to track the work and am getting stories / epic information for you. I'll attach the JIRAs to the PR above as well.

Spike: https://issues.redhat.com/browse/SPLAT-1789

@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 18, 2024
@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 18, 2024
This was referenced Sep 18, 2024
Draft
Draft
@vr4manta vr4manta changed the title WIP: Add vSphere multi disk support Add vSphere multi disk support Sep 23, 2024
@vr4manta vr4manta marked this pull request as ready for review September 23, 2024 13:36
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 23, 2024
@openshift-ci openshift-ci bot requested review from JoelSpeed and knobunc September 23, 2024 13:39
rvanderp3
rvanderp3 reviewed Sep 23, 2024
View reviewed changes
Copy link
Contributor

@rvanderp3 rvanderp3 left a comment

Choose a reason for hiding this comment

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

overall lgtm, i left a couple of comments. also, will there be a need for additional unit tests?

machine/v1beta1/types_vsphereprovider.go Outdated Show resolved Hide resolved
machine/v1beta1/types_vsphereprovider.go Outdated
@@ -172,6 +179,15 @@ type NetworkDeviceSpec struct {
AddressesFromPools []AddressesFromPool `json:"addressesFromPools,omitempty"`
}

// VSphereDisk describes additional disks for vSphere.
type VSphereDisk struct {
// The device name exposed. Used to identify the disk.
Copy link
Contributor

Choose a reason for hiding this comment

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

if not defined, what is the behavior? is a disk created for you?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If you do not specify a device name, it will still create the disk with the size you defined. The deviceName field is to be used by admin to sort of remind them what disk is meant to be used for (if they so desire).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So upstream recommended we use name as map for the devices. So this logic now requires a name and that name will be unique based on map / name.

Copy link
Contributor

Choose a reason for hiding this comment

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

You mean like a +listType=map?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, exactly.

@vr4manta
Copy link
Contributor Author

overall lgtm, i left a couple of comments. also, will there be a need for additional unit tests?

Unit tests are in the webhook for MAO. The CEL is being ignored based on current behavior of provider specs.

@vr4manta
Copy link
Contributor Author

/assign @JoelSpeed
Ready for review

@vr4manta vr4manta changed the title Add vSphere multi disk support SPLAT-1808: Add vSphere multi disk support Sep 23, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 23, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 23, 2024 •
edited by openshift-ci bot
Loading

@vr4manta: This pull request references SPLAT-1808 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.18.0" version, but no target version was set.

In response to this:

SPLAT-1808

Changes

  • Create new feature gate for vSphere multi disk
  • Create initial CRD changes for adding additional disks to vSphere machines

Notes

  • This is being done as part of vSphere work for this feature

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 openshift-eng/jira-lifecycle-plugin repository.

@rvanderp3
Copy link
Contributor

/lgtm

@vr4manta vr4manta force-pushed the vsphere_disk branch 2 times, most recently from a206d3e to b8357fa Compare December 3, 2024 15:40
@JoelSpeed
Copy link
Contributor

@vr4manta How are you getting on with upstream WRT this feature?

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 13, 2024
@vr4manta
Copy link
Contributor Author

vr4manta commented Jan 6, 2025

@vr4manta How are you getting on with upstream WRT this feature?

This is now merged. It merged during the holidays. I am updating any code related to this PR and will have ready shortly. Thanks!

@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 6, 2025
@vr4manta vr4manta force-pushed the vsphere_disk branch 2 times, most recently from 95334dd to 6aeca79 Compare January 6, 2025 13:32
@vr4manta
Copy link
Contributor Author

vr4manta commented Jan 6, 2025

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 6, 2025
@rvanderp3
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 6, 2025
@vr4manta
Copy link
Contributor Author

vr4manta commented Jan 7, 2025

/retest

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 7, 2025 •
edited by openshift-ci bot
Loading

@vr4manta: This pull request references SPLAT-1808 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

SPLAT-1808

Changes

  • Create new feature gate for vSphere multi disk
  • Create initial CRD changes for adding additional disks to vSphere machines

Blocks

Notes

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 8, 2025
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 8, 2025

@vr4manta: all tests passed!

Full PR test history. Your PR dashboard.

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

@JoelSpeed
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 8, 2025
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 8, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed, rvanderp3, vr4manta

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 8, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 78bd56d into openshift:master Jan 8, 2025
21 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-cluster-config-api
This PR has been included in build ose-cluster-config-api-container-v4.19.0-202501081838.p0.g78bd56d.assembly.stream.el9.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rvanderp3 rvanderp3 rvanderp3 left review comments

@JoelSpeed JoelSpeed JoelSpeed left review comments

@knobunc knobunc Awaiting requested review from knobunc

Assignees

@JoelSpeed JoelSpeed

@rvanderp3 rvanderp3

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@vr4manta @kannon92 @openshift-ci-robot @rvanderp3 @JoelSpeed @openshift-bot @openshift-merge-robot