feat(vmbda): add hotplug virtual image

api/Taskfile.dist.yaml

@@ -87,4 +87,4 @@ tasks:
       - go install -mod=readonly sigs.k8s.io/controller-tools/cmd/controller-gen@v{{ .CONTROLLER_GEN_VERSION }}
     status:
       - |
-        ls $GOPATH/bin/controller-gen
+        $GOPATH/bin/controller-gen --version | grep -q "v{{ .CONTROLLER_GEN_VERSION }}"

api/client/kubeclient/client.go

@@ -83,6 +83,8 @@ type VirtualMachineInterface interface {
 	Freeze(ctx context.Context, name string, opts v1alpha2.VirtualMachineFreeze) error
 	Unfreeze(ctx context.Context, name string) error
 	Migrate(ctx context.Context, name string, opts v1alpha2.VirtualMachineMigrate) error
+	AddVolume(ctx context.Context, name string, opts v1alpha2.VirtualMachineAddVolume) error
+	RemoveVolume(ctx context.Context, name string, opts v1alpha2.VirtualMachineRemoveVolume) error
 }
 
 type client struct {

api/client/kubeclient/vm.go

@@ -149,3 +149,27 @@ func (v vm) Migrate(ctx context.Context, name string, opts v1alpha2.VirtualMachi
 	}
 	return v.restClient.Put().AbsPath(path).Body(body).Do(ctx).Error()
 }
+
+func (v vm) AddVolume(ctx context.Context, name string, opts v1alpha2.VirtualMachineAddVolume) error {
+	path := fmt.Sprintf(subresourceURLTpl, v.namespace, v.resource, name, "addvolume")
+	return v.restClient.
+		Put().
+		AbsPath(path).
+		Param("name", opts.Name).
+		Param("volumeKind", opts.VolumeKind).
+		Param("pvcName", opts.PVCName).
+		Param("image", opts.Image).
+		Param("isCdrom", strconv.FormatBool(opts.IsCdrom)).
+		Do(ctx).
+		Error()
+}
+
+func (v vm) RemoveVolume(ctx context.Context, name string, opts v1alpha2.VirtualMachineRemoveVolume) error {
+	path := fmt.Sprintf(subresourceURLTpl, v.namespace, v.resource, name, "removevolume")
+	return v.restClient.
+		Put().
+		AbsPath(path).
+		Param("name", opts.Name).
+		Do(ctx).
+		Error()
+}

api/core/v1alpha2/virtual_machine_block_disk_attachment.go → api/core/v1alpha2/virtual_machine_block_device_attachment.go

@@ -72,18 +72,22 @@ type VirtualMachineBlockDeviceAttachmentStatus struct {
 type VMBDAObjectRef struct {
 	// The type of the block device. Options are:
 	// * `VirtualDisk` — use `VirtualDisk` as the disk. This type is always mounted in RW mode.
+	// * `VirtualImage` — use `VirtualImage` as the disk. This type is always mounted in RO mode.
+	// * `ClusterVirtualImage` - use `ClusterVirtualImage` as the disk. This type is always mounted in RO mode.
 	Kind VMBDAObjectRefKind `json:"kind,omitempty"`
 	// The name of block device to attach.
 	Name string `json:"name,omitempty"`
 }
 
 // VMBDAObjectRefKind defines the type of the block device.
 //
-// +kubebuilder:validation:Enum={VirtualDisk}
+// +kubebuilder:validation:Enum={VirtualDisk,VirtualImage,ClusterVirtualImage}
 type VMBDAObjectRefKind string
 
 const (
-	VMBDAObjectRefKindVirtualDisk VMBDAObjectRefKind = "VirtualDisk"
+	VMBDAObjectRefKindVirtualDisk         VMBDAObjectRefKind = "VirtualDisk"
+	VMBDAObjectRefKindVirtualImage        VMBDAObjectRefKind = "VirtualImage"
+	VMBDAObjectRefKindClusterVirtualImage VMBDAObjectRefKind = "ClusterVirtualImage"
 )
 
 // BlockDeviceAttachmentPhase defines current status of resource:

api/subresources/types.go

@@ -16,7 +16,9 @@ limitations under the License.
 
 package subresources
 
-import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
 
 // +genclient
 // +genclient:readonly
@@ -51,6 +53,11 @@ type VirtualMachinePortForward struct {
 
 type VirtualMachineAddVolume struct {
 	metav1.TypeMeta
+	Name       string
+	VolumeKind string
+	PVCName    string
+	Image      string
+	IsCdrom    bool
 }
 
 // +genclient
@@ -59,6 +66,7 @@ type VirtualMachineAddVolume struct {
 
 type VirtualMachineRemoveVolume struct {
 	metav1.TypeMeta
+	Name string
 }
 
 // +genclient

api/subresources/v1alpha2/types.go

@@ -55,6 +55,11 @@ type VirtualMachinePortForward struct {
 
 type VirtualMachineAddVolume struct {
 	metav1.TypeMeta `json:",inline"`
+	Name            string `json:"name"`
+	VolumeKind      string `json:"volumeKind"`
+	PVCName         string `json:"pvcName"`
+	Image           string `json:"image"`
+	IsCdrom         bool   `json:"isCdrom"`
 }
 
 // +genclient
@@ -64,6 +69,7 @@ type VirtualMachineAddVolume struct {
 
 type VirtualMachineRemoveVolume struct {
 	metav1.TypeMeta `json:",inline"`
+	Name            string `json:"name"`
 }
 
 // +genclient

crds/doc-ru-virtualmachineblockdeviceattachments.yaml

@@ -16,6 +16,8 @@ spec:
                       description: |
                         Тип блочного устройства. Возможны следующие варианты:
                         * `VirtualDisk` — использовать `VirtualDisk` в качестве диска. Этот тип всегда монтируется в режиме RW.
+                        * `VirtualImage` — использовать `VirtualImage` в качестве диска. Этот тип всегда монтируется в режиме RO.
+                        * `ClusterVirtualImage` - использовать `ClusterVirtualImage` в качестве диска. Этот тип всегда монтируется в режиме RO.
                     name:
                       description: |
                         Имя блочного устройства

crds/virtualmachineblockdeviceattachments.yaml

@@ -71,8 +71,12 @@ spec:
                       description: |-
                         The type of the block device. Options are:
                         * `VirtualDisk` — use `VirtualDisk` as the disk. This type is always mounted in RW mode.
+                        * `VirtualImage` — use `VirtualImage` as the disk. This type is always mounted in RO mode.
+                        * `ClusterVirtualImage` - use `ClusterVirtualImage` as the disk. This type is always mounted in RO mode.
                       enum:
                         - VirtualDisk
+                        - VirtualImage
+                        - ClusterVirtualImage
                       type: string
                     name:
                       description: The name of block device to attach.

images/virtualization-artifact/cmd/virtualization-controller/main.go

@@ -257,7 +257,7 @@ func main() {
 	}
 
 	vmbdaLogger := logger.NewControllerLogger(vmbda.ControllerName, logLevel, logOutput, logDebugVerbosity, logDebugControllerList)
-	if _, err = vmbda.NewController(ctx, mgr, vmbdaLogger, controllerNamespace); err != nil {
+	if _, err = vmbda.NewController(ctx, mgr, virtClient, vmbdaLogger, controllerNamespace); err != nil {
 		log.Error(err.Error())
 		os.Exit(1)
 	}