From 732cb984ea47fc5271c4756067ab813827252407 Mon Sep 17 00:00:00 2001 From: Pavel Tishkov Date: Sat, 17 Jan 2026 14:27:07 +0300 Subject: [PATCH 1/2] feat(vd): add VM name in wide output Signed-off-by: Pavel Tishkov --- api/core/v1alpha2/virtual_disk.go | 1 + api/core/v1alpha2/virtual_machine_block_device_attachment.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/api/core/v1alpha2/virtual_disk.go b/api/core/v1alpha2/virtual_disk.go index 906f3a5121..307908220e 100644 --- a/api/core/v1alpha2/virtual_disk.go +++ b/api/core/v1alpha2/virtual_disk.go @@ -37,6 +37,7 @@ const ( // +kubebuilder:printcolumn:name="Phase",type=string,JSONPath=`.status.phase` // +kubebuilder:printcolumn:name="Capacity",type=string,JSONPath=`.status.capacity` // +kubebuilder:printcolumn:name="InUse",type=string,JSONPath=`.status.conditions[?(@.type=='InUse')].status`,priority=1 +// +kubebuilder:printcolumn:name="VirtualMachine",type="string",JSONPath=".status.attachedToVirtualMachines[?(@.mounted==true)].name",description="Name of the virtual machine the disk is attached to." // +kubebuilder:printcolumn:name="Progress",type=string,JSONPath=`.status.progress`,priority=1 // +kubebuilder:printcolumn:name="StorageClass",type=string,JSONPath=`.status.storageClassName`,priority=1 // +kubebuilder:printcolumn:name="TargetPVC",type=string,JSONPath=`.status.target.persistentVolumeClaimName`,priority=1 diff --git a/api/core/v1alpha2/virtual_machine_block_device_attachment.go b/api/core/v1alpha2/virtual_machine_block_device_attachment.go index 7cf0801e48..edebebd18e 100644 --- a/api/core/v1alpha2/virtual_machine_block_device_attachment.go +++ b/api/core/v1alpha2/virtual_machine_block_device_attachment.go @@ -32,7 +32,7 @@ const ( // +kubebuilder:printcolumn:name="PHASE",type="string",JSONPath=".status.phase",description="VirtualMachineBlockDeviceAttachment phase." // +kubebuilder:printcolumn:name="BLOCKDEVICE KIND",type=string,JSONPath=`.spec.blockDeviceRef.kind`,priority=1,description="Attached blockdevice kind." // +kubebuilder:printcolumn:name="BLOCKDEVICE NAME",type=string,JSONPath=`.spec.blockDeviceRef.name`,priority=1,description="Attached blockdevice name." -// +kubebuilder:printcolumn:name="VIRTUAL MACHINE NAME",type="string",JSONPath=".status.virtualMachineName",description="Name of the virtual machine the disk is attached to." +// +kubebuilder:printcolumn:name="VIRTUALMACHINE",type="string",JSONPath=".status.virtualMachineName",description="Name of the virtual machine the disk is attached to." // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp",description="Time of resource creation." // +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object From 2d90db8a5427738a70c56c77a020a4b0b19f0a33 Mon Sep 17 00:00:00 2001 From: Pavel Tishkov Date: Sat, 17 Jan 2026 14:34:48 +0300 Subject: [PATCH 2/2] feat(vd): update CRDs Signed-off-by: Pavel Tishkov --- crds/virtualdisks.yaml | 4 ++++ crds/virtualmachineblockdeviceattachments.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/crds/virtualdisks.yaml b/crds/virtualdisks.yaml index 14e62a4a08..6387ffdf4e 100644 --- a/crds/virtualdisks.yaml +++ b/crds/virtualdisks.yaml @@ -32,6 +32,10 @@ spec: name: InUse priority: 1 type: string + - description: Name of the virtual machine the disk is attached to. + jsonPath: .status.attachedToVirtualMachines[?(@.mounted==true)].name + name: VirtualMachine + type: string - jsonPath: .status.progress name: Progress priority: 1 diff --git a/crds/virtualmachineblockdeviceattachments.yaml b/crds/virtualmachineblockdeviceattachments.yaml index 9f6f8c771e..906ade7f64 100644 --- a/crds/virtualmachineblockdeviceattachments.yaml +++ b/crds/virtualmachineblockdeviceattachments.yaml @@ -38,7 +38,7 @@ spec: type: string - description: Name of the virtual machine the disk is attached to. jsonPath: .status.virtualMachineName - name: VIRTUAL MACHINE NAME + name: VIRTUALMACHINE type: string - description: Time of resource creation. jsonPath: .metadata.creationTimestamp