Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions api/v1alpha2/virtualmachinegroup_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package v1alpha2

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
)

const (
Expand Down Expand Up @@ -159,9 +160,6 @@ type VirtualMachineGroupPlacementDatastoreStatus struct {
}

type VirtualMachinePlacementStatus struct {
// Name is the name of VirtualMachine member of this group.
Name string `json:"name"`

// +optional

// Zone describes the recommended zone for this VM.
Expand Down Expand Up @@ -199,6 +197,11 @@ type VirtualMachineGroupMemberStatus struct {

// +optional

// UID is the K8s metadata UID of this current member object.
UID types.UID `json:"uid,omitempty"`

// +optional

// Placement describes the placement results for this member.
//
// Please note this field is only set for VirtualMachine members.
Expand Down
5 changes: 3 additions & 2 deletions api/v1alpha2/zz_generated.conversion.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions api/v1alpha3/virtualmachinegroup_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package v1alpha3

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
)

const (
Expand Down Expand Up @@ -159,9 +160,6 @@ type VirtualMachineGroupPlacementDatastoreStatus struct {
}

type VirtualMachinePlacementStatus struct {
// Name is the name of VirtualMachine member of this group.
Name string `json:"name"`

// +optional

// Zone describes the recommended zone for this VM.
Expand Down Expand Up @@ -199,6 +197,11 @@ type VirtualMachineGroupMemberStatus struct {

// +optional

// UID is the K8s metadata UID of this current member object.
UID types.UID `json:"uid,omitempty"`

// +optional

// Placement describes the placement results for this member.
//
// Please note this field is only set for VirtualMachine members.
Expand Down
5 changes: 3 additions & 2 deletions api/v1alpha3/zz_generated.conversion.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions api/v1alpha4/virtualmachinegroup_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package v1alpha4

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
)

const (
Expand Down Expand Up @@ -159,9 +160,6 @@ type VirtualMachineGroupPlacementDatastoreStatus struct {
}

type VirtualMachinePlacementStatus struct {
// Name is the name of VirtualMachine member of this group.
Name string `json:"name"`

// +optional

// Zone describes the recommended zone for this VM.
Expand Down Expand Up @@ -199,6 +197,11 @@ type VirtualMachineGroupMemberStatus struct {

// +optional

// UID is the K8s metadata UID of this current member object.
UID types.UID `json:"uid,omitempty"`

// +optional

// Placement describes the placement results for this member.
//
// Please note this field is only set for VirtualMachine members.
Expand Down
5 changes: 3 additions & 2 deletions api/v1alpha4/zz_generated.conversion.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 6 additions & 8 deletions api/v1alpha5/virtualmachinegroup_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package v1alpha5

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
)

const (
Expand All @@ -20,11 +21,6 @@ const (
// VirtualMachineGroupMemberConditionPlacementReady indicates that the
// member has a placement decision ready.
VirtualMachineGroupMemberConditionPlacementReady = "PlacementReady"

// VirtualMachineGroupMemberAlreadyPlacedReason indicates that the
// group member already exists on the back-end infrastructure
// (e.g., vSphere) and therefore does not require placement.
VirtualMachineGroupMemberAlreadyPlacedReason = "AlreadyPlaced"
)

// GroupMember describes a member of a VirtualMachineGroup.
Expand Down Expand Up @@ -164,9 +160,6 @@ type VirtualMachineGroupPlacementDatastoreStatus struct {
}

type VirtualMachinePlacementStatus struct {
// Name is the name of VirtualMachine member of this group.
Name string `json:"name"`

// +optional

// Zone describes the recommended zone for this VM.
Expand Down Expand Up @@ -204,6 +197,11 @@ type VirtualMachineGroupMemberStatus struct {

// +optional

// UID is the K8s metadata UID of this current member object.
UID types.UID `json:"uid,omitempty"`

// +optional

// Placement describes the placement results for this member.
//
// Please note this field is only set for VirtualMachine members.
Expand Down
40 changes: 16 additions & 24 deletions config/crd/bases/vmoperator.vmware.com_virtualmachinegroups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -361,10 +361,6 @@ spec:
- name
type: object
type: array
name:
description: Name is the name of VirtualMachine member of
this group.
type: string
node:
description: Node describes the recommended node for this
VM.
Expand All @@ -377,8 +373,6 @@ spec:
description: Zone describes the recommended zone for this
VM.
type: string
required:
- name
type: object
powerState:
description: |-
Expand All @@ -390,6 +384,10 @@ spec:
- PoweredOn
- Suspended
type: string
uid:
description: UID is the K8s metadata UID of this current member
object.
type: string
required:
- kind
- name
Expand Down Expand Up @@ -750,10 +748,6 @@ spec:
- name
type: object
type: array
name:
description: Name is the name of VirtualMachine member of
this group.
type: string
node:
description: Node describes the recommended node for this
VM.
Expand All @@ -766,8 +760,6 @@ spec:
description: Zone describes the recommended zone for this
VM.
type: string
required:
- name
type: object
powerState:
description: |-
Expand All @@ -779,6 +771,10 @@ spec:
- PoweredOn
- Suspended
type: string
uid:
description: UID is the K8s metadata UID of this current member
object.
type: string
required:
- kind
- name
Expand Down Expand Up @@ -1139,10 +1135,6 @@ spec:
- name
type: object
type: array
name:
description: Name is the name of VirtualMachine member of
this group.
type: string
node:
description: Node describes the recommended node for this
VM.
Expand All @@ -1155,8 +1147,6 @@ spec:
description: Zone describes the recommended zone for this
VM.
type: string
required:
- name
type: object
powerState:
description: |-
Expand All @@ -1168,6 +1158,10 @@ spec:
- PoweredOn
- Suspended
type: string
uid:
description: UID is the K8s metadata UID of this current member
object.
type: string
required:
- kind
- name
Expand Down Expand Up @@ -1528,10 +1522,6 @@ spec:
- name
type: object
type: array
name:
description: Name is the name of VirtualMachine member of
this group.
type: string
node:
description: Node describes the recommended node for this
VM.
Expand All @@ -1544,8 +1534,6 @@ spec:
description: Zone describes the recommended zone for this
VM.
type: string
required:
- name
type: object
powerState:
description: |-
Expand All @@ -1557,6 +1545,10 @@ spec:
- PoweredOn
- Suspended
type: string
uid:
description: UID is the K8s metadata UID of this current member
object.
type: string
required:
- kind
- name
Expand Down
Loading