This repository has been archived by the owner on Dec 14, 2023. It is now read-only.
Match DV disks with volumes #29
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mfranczy
changed the title
gardener-robot-ci-3
added
the
reviewed/ok-to-test
gardener-robot
added
size/l
|
@stoyanr PR is still in progress casue I didn't test that yet, tomorrow during the sync meeting we have to discuss |
gardener-robot-ci-2
added
needs/ok-to-test
mfranczy
commented
Oct 14, 2020
mfranczy
force-pushed
the
perf-options
branch
from
402158a to
f47eba4
Compare
gardener-robot
added
size/s
gardener-robot-ci-2
added
the
reviewed/ok-to-test
gardener-robot-ci-3
removed
the
reviewed/ok-to-test
mfranczy
force-pushed
the
perf-options
branch
from
f47eba4 to
6ded4c1
Compare
gardener-robot
added
size/m
gardener-robot-ci-1
added
the
reviewed/ok-to-test
gardener-robot-ci-2
removed
the
reviewed/ok-to-test
mfranczy
force-pushed
the
perf-options
branch
from
6ded4c1 to
787e2b2
Compare
mfranczy
changed the title
gardener-robot-ci-3
added
the
reviewed/ok-to-test
gardener-robot-ci-2
removed
the
reviewed/ok-to-test
mfranczy
force-pushed
the
perf-options
branch
from
787e2b2 to
3a2cc7d
Compare
gardener-robot-ci-1
added
the
reviewed/ok-to-test
gardener-robot-ci-3
removed
the
reviewed/ok-to-test
stoyanr
suggested changes
Oct 16, 2020
pkg/kubevirt/apis/provider_spec.go
Outdated
| @@ -64,6 +69,8 @@ type KubeVirtProviderSpec struct { | |||
| // AdditionalVolumeSpec represents an additional volume attached to a VM. | |||
| // Only one of its members may be specified. | |||
| type AdditionalVolumeSpec struct { | |||
| // Name of the volume | |||
There was a problem hiding this comment.
Suggested change
| // Name of the volume | |
| // Name is the additional volume name |
pkg/kubevirt/apis/provider_spec.go
Outdated
| @@ -89,6 +96,22 @@ type VolumeSource struct { | |||
| Secret *kubevirtv1.SecretVolumeSource `json:"secret,omitempty"` | |||
| } | |||
|
|
|||
| // Devices allows to fine-tune devices attached to KubeVirt VM | |||
| type Devices struct { | |||
| // Disks allows to customize disks attached to KubeVirt VM | |||
There was a problem hiding this comment.
Suggested change
| // Disks allows to customize disks attached to KubeVirt VM | |
| // Disks allows customizing the disks attached to the VM. |
pkg/kubevirt/apis/provider_spec.go
Outdated
| // Disks allows to customize disks attached to KubeVirt VM | ||
| // +optional | ||
| Disks []kubevirtv1.Disk `json:"disks,omitempty"` | ||
| // Whether to have random number generator from host |
There was a problem hiding this comment.
Suggested change
| // Whether to have random number generator from host | |
| // Rng specifies whether to have a random number generator from host. |
pkg/kubevirt/apis/provider_spec.go
Outdated
| // Whether to have random number generator from host | ||
| // +optional | ||
| Rng *kubevirtv1.Rng `json:"rng,omitempty"` | ||
| // Whether or not to enable virtio multi-queue for block devices |
There was a problem hiding this comment.
Suggested change
| // Whether or not to enable virtio multi-queue for block devices | |
| // BlockMultiQueue specifies whether to enable virtio multi-queue for block devices. |
pkg/kubevirt/apis/provider_spec.go
Outdated
| // Whether or not to enable virtio multi-queue for block devices | ||
| // +optional | ||
| BlockMultiQueue bool `json:"blockMultiQueue,omitempty"` | ||
| // If specified, virtual network interfaces configured with a virtio bus will also enable the vhost multiqueue feature |
There was a problem hiding this comment.
Suggested change
| // If specified, virtual network interfaces configured with a virtio bus will also enable the vhost multiqueue feature | |
| // NetworkInterfaceMultiQueue specifies whether virtual network interfaces configured with a virtio bus will also enable the vhost multi-queue feature. |
pkg/kubevirt/core/util.go
Outdated
| @@ -163,26 +163,47 @@ ethernets: | |||
| return interfaces, networks, networkData | |||
| } | |||
|
|
|||
| func findDiskByVolumeName(name string, disks []kubevirtv1.Disk) *kubevirtv1.Disk { | |||
There was a problem hiding this comment.
This function finds a disk in a slice by its name, no "volume" here.
Suggested change
| func findDiskByVolumeName(name string, disks []kubevirtv1.Disk) *kubevirtv1.Disk { | |
| func findDiskByName(name string, disks []kubevirtv1.Disk) *kubevirtv1.Disk { |
pkg/kubevirt/core/util.go
Outdated
| return nil | ||
| } | ||
|
|
||
| func generateDefaultDisk(name string) kubevirtv1.Disk { |
There was a problem hiding this comment.
Let's use build rather than generate for consistency with the rest of the code.
Suggested change
| func generateDefaultDisk(name string) kubevirtv1.Disk { | |
| func buildDefaultDisk(name string) kubevirtv1.Disk { |
pkg/kubevirt/core/util.go
Outdated
| func buildVolumes( | ||
| machineName, namespace, userDataSecretName, networkData string, | ||
| rootVolume cdicorev1alpha1.DataVolumeSpec, | ||
| additionalVolumes []api.AdditionalVolumeSpec, | ||
| providedDisks []kubevirtv1.Disk, |
There was a problem hiding this comment.
I would use configuredDisks as it's a bit more concrete.
Suggested change
| providedDisks []kubevirtv1.Disk, | |
| configuredDisks []kubevirtv1.Disk, |
| return errs | ||
| } | ||
|
|
||
| func hasDiskVolumeMatch(diskName string, volumes []api.AdditionalVolumeSpec) bool { |
There was a problem hiding this comment.
This function checks whether the given slice has a volume with the given name.
Suggested change
| func hasDiskVolumeMatch(diskName string, volumes []api.AdditionalVolumeSpec) bool { | |
| func hasVolumeWithName(diskName string, volumes []api.AdditionalVolumeSpec) bool { |
pkg/kubevirt/core/util.go
Outdated
| @@ -163,26 +163,47 @@ ethernets: | |||
| return interfaces, networks, networkData | |||
| } | |||
|
|
|||
| func findDiskByVolumeName(name string, disks []kubevirtv1.Disk) *kubevirtv1.Disk { | |||
There was a problem hiding this comment.
Could you please move the 2 helper functions findDiskByName and buildDefaultDisk below buildVolumes for consistency with the rest of the code?
Signed-off-by: Marcin Franczyk <[email protected]>
mfranczy
force-pushed
the
perf-options
branch
from
3a2cc7d to
b34ccb3
Compare
gardener-robot-ci-3
added
the
reviewed/ok-to-test
|
@stoyanr I addressed all your comments. |
gardener-robot-ci-2
removed
the
reviewed/ok-to-test
stoyanr
approved these changes
Oct 16, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Marcin Franczyk [email protected]
What this PR does / why we need it:
It allows to pass devices options and matches disks settings with volumes
Which issue(s) this PR fixes:
Fixes gardener-attic/gardener-extension-provider-kubevirt#36
Special notes for your reviewer:
Release note: