Skip to content

✨ Allow using moid #3229

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

Merged
k8s-ci-robot merged 4 commits into from
Nov 12, 2024
Merged

✨ Allow using moid #3229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
faf2cc3
Allow using MOID on fields
Oct 18, 2024
a609a3b
Apply suggestions from code review
rikatz Nov 7, 2024
65efed1
Standardize error return on envvar controller
Nov 7, 2024
a880497
Fix API comment to support moref and moid
Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions apis/v1beta1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ const (

// VirtualMachineCloneSpec is information used to clone a virtual machine.
type VirtualMachineCloneSpec struct {
// Template is the name or inventory path of the template used to clone
// the virtual machine.
// Template is the name, inventory path, managed object reference or the managed
// object ID of the template used to clone the virtual machine.
// +kubebuilder:validation:MinLength=1
Template string `json:"template"`

Expand Down Expand Up @@ -127,19 +127,19 @@ type VirtualMachineCloneSpec struct {
// +optional
Thumbprint string `json:"thumbprint,omitempty"`

// Datacenter is the name or inventory path of the datacenter in which the
// virtual machine is created/located.
// Datacenter is the name, inventory path, managed object reference or the managed
// object ID of the datacenter in which the virtual machine is created/located.
// Defaults to * which selects the default datacenter.
// +optional
Datacenter string `json:"datacenter,omitempty"`

// Folder is the name or inventory path of the folder in which the
// virtual machine is created/located.
// Folder is the name, inventory path, managed object reference or the managed
// object ID of the folder in which the virtual machine is created/located.
// +optional
Folder string `json:"folder,omitempty"`

// Datastore is the name or inventory path of the datastore in which the
// virtual machine is created/located.
// Datastore is the name, inventory path, managed object reference or the managed
// object ID of the datastore in which the virtual machine is created/located.
// +optional
Datastore string `json:"datastore,omitempty"`

Expand All @@ -148,8 +148,8 @@ type VirtualMachineCloneSpec struct {
// +optional
StoragePolicyName string `json:"storagePolicyName,omitempty"`

// ResourcePool is the name or inventory path of the resource pool in which
// the virtual machine is created/located.
// ResourcePool is the name, inventory path, managed object reference or the managed
// object ID in which the virtual machine is created/located.
// +optional
ResourcePool string `json:"resourcePool,omitempty"`

Expand Down Expand Up @@ -299,8 +299,8 @@ type NetworkSpec struct {
// NetworkDeviceSpec defines the network configuration for a virtual machine's
// network device.
type NetworkDeviceSpec struct {
// NetworkName is the name of the vSphere network to which the device
// will be connected.
// NetworkName is the name, managed object reference or the managed
// object ID of the vSphere network to which the device will be connected.
NetworkName string `json:"networkName"`

// DeviceName may be used to explicitly assign a name to the network device
Expand Down
24 changes: 12 additions & 12 deletions config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachines.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -976,14 +976,14 @@ spec:
type: object
datacenter:
description: |-
Datacenter is the name or inventory path of the datacenter in which the
virtual machine is created/located.
Datacenter is the name, inventory path, managed object reference or the managed
object ID of the datacenter in which the virtual machine is created/located.
Defaults to * which selects the default datacenter.
type: string
datastore:
description: |-
Datastore is the name or inventory path of the datastore in which the
virtual machine is created/located.
Datastore is the name, inventory path, managed object reference or the managed
object ID of the datastore in which the virtual machine is created/located.
type: string
diskGiB:
description: |-
Expand All @@ -999,8 +999,8 @@ spec:
type: string
folder:
description: |-
Folder is the name or inventory path of the folder in which the
virtual machine is created/located.
Folder is the name, inventory path, managed object reference or the managed
object ID of the folder in which the virtual machine is created/located.
type: string
guestSoftPowerOffTimeout:
description: |-
Expand Down Expand Up @@ -1237,8 +1237,8 @@ spec:
type: array
networkName:
description: |-
NetworkName is the name of the vSphere network to which the device
will be connected.
NetworkName is the name, managed object reference or the managed
object ID of the vSphere network to which the device will be connected.
type: string
routes:
description: Routes is a list of optional, static routes
Expand Down Expand Up @@ -1400,8 +1400,8 @@ spec:
type: string
resourcePool:
description: |-
ResourcePool is the name or inventory path of the resource pool in which
the virtual machine is created/located.
ResourcePool is the name, inventory path, managed object reference or the managed
object ID in which the virtual machine is created/located.
type: string
server:
description: |-
Expand All @@ -1428,8 +1428,8 @@ spec:
type: array
template:
description: |-
Template is the name or inventory path of the template used to clone
the virtual machine.
Template is the name, inventory path, managed object reference or the managed
object ID of the template used to clone the virtual machine.
minLength: 1
type: string
thumbprint:
Expand Down
24 changes: 12 additions & 12 deletions config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachinetemplates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,14 +846,14 @@ spec:
type: object
datacenter:
description: |-
Datacenter is the name or inventory path of the datacenter in which the
virtual machine is created/located.
Datacenter is the name, inventory path, managed object reference or the managed
object ID of the datacenter in which the virtual machine is created/located.
Defaults to * which selects the default datacenter.
type: string
datastore:
description: |-
Datastore is the name or inventory path of the datastore in which the
virtual machine is created/located.
Datastore is the name, inventory path, managed object reference or the managed
object ID of the datastore in which the virtual machine is created/located.
type: string
diskGiB:
description: |-
Expand All @@ -869,8 +869,8 @@ spec:
type: string
folder:
description: |-
Folder is the name or inventory path of the folder in which the
virtual machine is created/located.
Folder is the name, inventory path, managed object reference or the managed
object ID of the folder in which the virtual machine is created/located.
type: string
guestSoftPowerOffTimeout:
description: |-
Expand Down Expand Up @@ -1110,8 +1110,8 @@ spec:
type: array
networkName:
description: |-
NetworkName is the name of the vSphere network to which the device
will be connected.
NetworkName is the name, managed object reference or the managed
object ID of the vSphere network to which the device will be connected.
type: string
routes:
description: Routes is a list of optional, static
Expand Down Expand Up @@ -1276,8 +1276,8 @@ spec:
type: string
resourcePool:
description: |-
ResourcePool is the name or inventory path of the resource pool in which
the virtual machine is created/located.
ResourcePool is the name, inventory path, managed object reference or the managed
object ID in which the virtual machine is created/located.
type: string
server:
description: |-
Expand All @@ -1304,8 +1304,8 @@ spec:
type: array
template:
description: |-
Template is the name or inventory path of the template used to clone
the virtual machine.
Template is the name, inventory path, managed object reference or the managed
object ID of the template used to clone the virtual machine.
minLength: 1
type: string
thumbprint:
Expand Down
24 changes: 12 additions & 12 deletions config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherevms.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,14 +1066,14 @@ spec:
type: object
datacenter:
description: |-
Datacenter is the name or inventory path of the datacenter in which the
virtual machine is created/located.
Datacenter is the name, inventory path, managed object reference or the managed
object ID of the datacenter in which the virtual machine is created/located.
Defaults to * which selects the default datacenter.
type: string
datastore:
description: |-
Datastore is the name or inventory path of the datastore in which the
virtual machine is created/located.
Datastore is the name, inventory path, managed object reference or the managed
object ID of the datastore in which the virtual machine is created/located.
type: string
diskGiB:
description: |-
Expand All @@ -1084,8 +1084,8 @@ spec:
type: integer
folder:
description: |-
Folder is the name or inventory path of the folder in which the
virtual machine is created/located.
Folder is the name, inventory path, managed object reference or the managed
object ID of the folder in which the virtual machine is created/located.
type: string
guestSoftPowerOffTimeout:
description: |-
Expand Down Expand Up @@ -1322,8 +1322,8 @@ spec:
type: array
networkName:
description: |-
NetworkName is the name of the vSphere network to which the device
will be connected.
NetworkName is the name, managed object reference or the managed
object ID of the vSphere network to which the device will be connected.
type: string
routes:
description: Routes is a list of optional, static routes
Expand Down Expand Up @@ -1480,8 +1480,8 @@ spec:
type: string
resourcePool:
description: |-
ResourcePool is the name or inventory path of the resource pool in which
the virtual machine is created/located.
ResourcePool is the name, inventory path, managed object reference or the managed
object ID in which the virtual machine is created/located.
type: string
server:
description: |-
Expand All @@ -1508,8 +1508,8 @@ spec:
type: array
template:
description: |-
Template is the name or inventory path of the template used to clone
the virtual machine.
Template is the name, inventory path, managed object reference or the managed
object ID of the template used to clone the virtual machine.
minLength: 1
type: string
thumbprint:
Expand Down
1 change: 0 additions & 1 deletion pkg/context/fake/fake_vm_context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ func newVSphereVM() infrav1.VSphereVM {
ObjectMeta: metav1.ObjectMeta{
Namespace: Namespace,
Name: VSphereVMName,
UID: VSphereVMUUID,
},
Spec: infrav1.VSphereVMSpec{
VirtualMachineCloneSpec: infrav1.VirtualMachineCloneSpec{
Expand Down
Loading