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
2 changes: 2 additions & 0 deletions api/v1/eviction_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ type EvictionStatus struct {
OutstandingInstances []string `json:"outstandingInstances"`

// Conditions is an array of current conditions
// +listType=map
// +listMapKey=type
Conditions []metav1.Condition `json:"conditions,omitempty"`
}

Expand Down
4 changes: 3 additions & 1 deletion api/v1/hypervisor_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,9 @@ type HypervisorStatus struct {
Evicted bool `json:"evicted,omitempty"`

// Represents the Hypervisor node conditions.
Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
// +listType=map
// +listMapKey=type
Conditions []metav1.Condition `json:"conditions,omitempty"`

SpecHash string `json:"specHash,omitempty"`
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ spec:
- type
type: object
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
hypervisorServiceId:
type: string
outstandingInstances:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,9 @@ spec:
- type
type: object
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
domainCapabilities:
description: |-
Auto-discovered domain capabilities relevant to check if a VM
Expand Down
Loading