Bug 1816714: ovirt - add vnic profile id to platform#3406
Bug 1816714: ovirt - add vnic profile id to platform#3406openshift-merge-robot merged 3 commits intoopenshift:masterfrom
Conversation
5f9076b to
eaced32
Compare
|
@patrickdillon @wking PTAL |
|
@rgolangh: This pull request references Bugzilla bug 1816714, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker. 3 validation(s) were run on this bug
DetailsIn response to this:
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. |
|
@rgolangh: This pull request references Bugzilla bug 1816714, which is valid. 3 validation(s) were run on this bug
DetailsIn response to this:
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. |
|
code looks solid to my noob eyeballs, nice work |
|
/cc @Gal-Zaidman @sandrobonazzola |
|
/retest |
|
Is this fix already in a nightly build? |
no, it wouldn't be in a build if it hasn't merged |
|
/cherry-pick release-4.4 Cherrypicking this for https://bugzilla.redhat.com/show_bug.cgi?id=1820575 |
|
@sferich888: once the present PR merges, I will cherry-pick it on top of release-4.4 in a new PR and assign it to you. DetailsIn response to this:
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. |
|
/retest |
|
/assign |
|
@Gal-Zaidman @sandrobonazzola can you please review the ovirt specific bits here while installer team takes on review of the generic components |
|
The CI failure indicates a problem when I don't think Can we assume that default if the variable is not set in the install config? Ideally that would be done outside of terraform and passed in tfvars. If you need to do it in terraform, you will need to set a default value for the variable--but (again) doing this in go and not terraform is easier/cleaner. |
The assumption is what cause the bug - there is no way to 'guess' the vnic profile name and choosing the first one in the list is a poor choice. That heuristic is my terrible mistake. Like you mentioned, getting the defaults from go is much more desirable and I'll look for a clean way to do it. |
fa64f87 to
d12512d
Compare
|
/test e2e-ovirt |
516b2b4 to
0414c6d
Compare
|
/retest |
There was a problem hiding this comment.
Shouldn't this logic only be run if installConfig.Config.Platform.Ovirt.VNICProfileID is not set?
There was a problem hiding this comment.
right, I missed it during the refactoring. adding back
There was a problem hiding this comment.
If i understand correctly this is different default behavior than what you're replacing, but that behavior would be considered a bug so this is ok, in my opinion.
9339ec8 to
7f10dfd
Compare
|
I will try to summarize Slack conversation: It doesn't look like this will set VNIC profile ID for compute nodes. ovirt MachinePools are being added in #3399 Is there a benefit from merging this before these changes? What is the effect when the changes happen on control plane but not compute? |
|
@rgolangh: This pull request references Bugzilla bug 1816714, which is valid. 3 validation(s) were run on this bug
DetailsIn response to this:
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. |
Vnic and network name are currently generic definition that goes into the template creation. Both masters and workers gets them because they use the same template.
The cluster api provider still doesn't support customizing the nics of a machine.
|
There was a problem hiding this comment.
This validation is providing a default value, but I think you are already doing that elsewhere. Validation should be checking that if a user provides a value then it is valid.
There was a problem hiding this comment.
this is replying nil if valid (line 63) or error in some cases. Maybe your are talking about the 2nd use of it.?
There was a problem hiding this comment.
The way I am reading this code:
if user provided a vnic profile ID: do nothing (it is valid)
if user did not provide a vnic profile ID: see if you can determine a default or else return an error
What I was expecting:
if user provided a vnic profile ID: validate (use API to determine if user provided value is correct)
if user did not provide: do nothing (default will be assigned later)
Does that make sense? I could definitely have mistaken assumptions here.
|
@patrickdillon it really seems that adding this to machine spec makes more sense. So I added openshift/cluster-api-provider-ovirt#45 and this will find its way into #3399 |
Signed-off-by: Roy Golan <rgolan@redhat.com>
Signed-off-by: Roy Golan <rgolan@redhat.com>
The vnic profile that all the VM shares can now be configurable through
the platform and is part of the wizard, in case there are multiple for the
selected network.
```yaml
platform:
ovirt:
vnicProfileID: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
```
Signed-off-by: Roy Golan <rgolan@redhat.com>
|
/test e2e-ovirt |
|
@rgolangh: This pull request references Bugzilla bug 1816714, which is valid. 3 validation(s) were run on this bug
DetailsIn response to this:
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. |
|
/test e2e-ovirt |
|
/test e2e-openstack |
|
/lgtm |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: abhinavdahiya, sdodson The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
@rgolangh: All pull requests linked via external trackers have merged: openshift/installer#3406. Bugzilla bug 1816714 has been moved to the MODIFIED state. DetailsIn response to this:
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. |
|
@sferich888: #3406 failed to apply on top of branch "release-4.4": DetailsIn response to this:
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. |
The vnic profile that all the VM shares can now be configurable through
the platform.
The wizard will also ask to the user the choose one, in case there are multiple profiles per network.