fix: use StorageClass annotation to select VolumeSnapshotClass for PVC clone

.github/workflows/dev_module_build.yml

@@ -332,6 +332,33 @@ jobs:
           task virtualization-controller:init
           task virtualization-controller:test:unit
 
+  cdi_artifact:
+    runs-on: ubuntu-22.04
+    name: cdi-artifact lint and unit tests
+    steps:
+      - name: Set up Go ${{ env.GO_VERSION }}
+        uses: actions/setup-go@v5
+        with:
+          go-version: "${{ env.GO_VERSION }}"
+
+      - name: Install Task
+        uses: go-task/setup-task@v2
+        with:
+          version: 3.x
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+
+      - name: Install golangci-lint
+        run: |
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v${{ env.GOLANGCI_LINT_VERSION}}
+          echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
+
+      - name: Run cdi-artifact lint and unit tests
+        run: task cdi-artifact:ci
+
   test_scripts_js:
     runs-on: ubuntu-22.04
     name: Run JS unit tests

Taskfile.yaml

@@ -15,6 +15,9 @@ includes:
   gohooks:
     taskfile: ./images/hooks
     dir: ./images/hooks
+  cdi-artifact:
+    taskfile: ./images/cdi-artifact
+    dir: ./images/cdi-artifact
   e2e:
     taskfile: ./test/e2e
     dir: ./test/e2e

api/client/kubeclient/client.go

@@ -56,6 +56,7 @@ type Client interface {
 	VirtualMachines(namespace string) virtualizationv1alpha2.VirtualMachineInterface
 	VirtualImages(namespace string) virtualizationv1alpha2.VirtualImageInterface
 	VirtualDisks(namespace string) virtualizationv1alpha2.VirtualDiskInterface
+	VirtualDiskSnapshots(namespace string) virtualizationv1alpha2.VirtualDiskSnapshotInterface
 	VirtualMachineBlockDeviceAttachments(namespace string) virtualizationv1alpha2.VirtualMachineBlockDeviceAttachmentInterface
 	VirtualMachineIPAddresses(namespace string) virtualizationv1alpha2.VirtualMachineIPAddressInterface
 	VirtualMachineIPAddressLeases() virtualizationv1alpha2.VirtualMachineIPAddressLeaseInterface
@@ -96,6 +97,10 @@ func (c client) VirtualDisks(namespace string) virtualizationv1alpha2.VirtualDis
 	return c.virtClient.VirtualizationV1alpha2().VirtualDisks(namespace)
 }
 
+func (c client) VirtualDiskSnapshots(namespace string) virtualizationv1alpha2.VirtualDiskSnapshotInterface {
+	return c.virtClient.VirtualizationV1alpha2().VirtualDiskSnapshots(namespace)
+}
+
 func (c client) VirtualMachineBlockDeviceAttachments(namespace string) virtualizationv1alpha2.VirtualMachineBlockDeviceAttachmentInterface {
 	return c.virtClient.VirtualizationV1alpha2().VirtualMachineBlockDeviceAttachments(namespace)
 }

build/components/versions.yml

@@ -3,8 +3,7 @@ firmware:
   libvirt: v10.9.0
   edk2: stable202411
 core:
-  3p-kubevirt: v1.6.2-v12n.49
-  3p-containerized-data-importer: v1.60.3-v12n.20
+  3p-kubevirt: fix/volume-umount-retries
   distribution: 2.8.3
 package:
   acl: v2.3.1

crds/embedded/storageprofiles.yaml

@@ -0,0 +1,155 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  labels:
+    heritage: deckhouse
+    module: virtualization
+    app.kubernetes.io/component: virtualization-controller
+  name: internalvirtualizationstorageprofiles.cdi.internal.virtualization.deckhouse.io
+spec:
+  group: cdi.internal.virtualization.deckhouse.io
+  names:
+    categories:
+    - intvirt
+    kind: InternalVirtualizationStorageProfile
+    listKind: InternalVirtualizationStorageProfileList
+    plural: internalvirtualizationstorageprofiles
+    shortNames:
+    - intvirtsp
+    singular: internalvirtualizationstorageprofile
+  scope: Cluster
+  versions:
+  - name: v1beta1
+    schema:
+      openAPIV3Schema:
+        description: StorageProfile provides storage capability recommendations
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: StorageProfileSpec defines specification for StorageProfile
+            properties:
+              claimPropertySets:
+                description: ClaimPropertySets is a provided set of properties applicable
+                  to PVC
+                items:
+                  description: ClaimPropertySet is a set of properties applicable
+                    to PVC
+                  properties:
+                    accessModes:
+                      description: |-
+                        AccessModes contains the desired access modes the volume should have.
+                        More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
+                      items:
+                        type: string
+                      maxItems: 4
+                      type: array
+                      x-kubernetes-validations:
+                      - message: Illegal AccessMode
+                        rule: self.all(am, am in ['ReadWriteOnce', 'ReadOnlyMany',
+                          'ReadWriteMany', 'ReadWriteOncePod'])
+                    volumeMode:
+                      description: |-
+                        VolumeMode defines what type of volume is required by the claim.
+                        Value of Filesystem is implied when not included in claim spec.
+                      enum:
+                      - Block
+                      - Filesystem
+                      type: string
+                  required:
+                  - accessModes
+                  - volumeMode
+                  type: object
+                maxItems: 8
+                type: array
+              cloneStrategy:
+                description: CloneStrategy defines the preferred method for cloning
+                  a volume
+                type: string
+              dataImportCronSourceFormat:
+                description: DataImportCronSourceFormat defines the format of the
+                  DataImportCron-created disk image sources
+                type: string
+              snapshotClass:
+                description: SnapshotClass is optional specific VolumeSnapshotClass
+                  for CloneStrategySnapshot. If not set, a VolumeSnapshotClass is
+                  chosen according to the provisioner.
+                type: string
+            type: object
+          status:
+            description: StorageProfileStatus provides the most recently observed
+              status of the StorageProfile
+            properties:
+              claimPropertySets:
+                description: ClaimPropertySets computed from the spec and detected
+                  in the system
+                items:
+                  description: ClaimPropertySet is a set of properties applicable
+                    to PVC
+                  properties:
+                    accessModes:
+                      description: |-
+                        AccessModes contains the desired access modes the volume should have.
+                        More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
+                      items:
+                        type: string
+                      maxItems: 4
+                      type: array
+                      x-kubernetes-validations:
+                      - message: Illegal AccessMode
+                        rule: self.all(am, am in ['ReadWriteOnce', 'ReadOnlyMany',
+                          'ReadWriteMany', 'ReadWriteOncePod'])
+                    volumeMode:
+                      description: |-
+                        VolumeMode defines what type of volume is required by the claim.
+                        Value of Filesystem is implied when not included in claim spec.
+                      enum:
+                      - Block
+                      - Filesystem
+                      type: string
+                  required:
+                  - accessModes
+                  - volumeMode
+                  type: object
+                maxItems: 8
+                type: array
+              cloneStrategy:
+                description: CloneStrategy defines the preferred method for cloning
+                  a volume
+                type: string
+              dataImportCronSourceFormat:
+                description: DataImportCronSourceFormat defines the format of the
+                  DataImportCron-created disk image sources
+                type: string
+              provisioner:
+                description: The Storage class provisioner plugin name
+                type: string
+              snapshotClass:
+                description: SnapshotClass is optional specific VolumeSnapshotClass
+                  for CloneStrategySnapshot. If not set, a VolumeSnapshotClass is
+                  chosen according to the provisioner.
+                type: string
+              storageClass:
+                description: The StorageClass name for which capabilities are defined
+                type: string
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true

crds/embedded/virtualmachines.yaml

@@ -4461,7 +4461,7 @@ spec:
                   ready
                 type: boolean
               restoreInProgress:
-                description: RestoreInProgress is the name of the VirtualMachineRestore
+                description: RestoreInProgress is the name of the restore operation
                   currently executing
                 type: string
               runStrategy:

images/README.md

@@ -4,4 +4,5 @@ Kubevirt is built as a single bundle as a virt-artifact. Then all necessary virt
 
 https://github.com/kubevirt/kubevirt/blob/v1.3.1/BUILD.bazel#L215-L224
 
-The same thing for cdi (cdi-artifact).
+The CDI importer code used by virtual-disk-importer is vendored in
+images/cdi-artifact and built from this repository.

images/cdi-artifact/.golangci.yaml

@@ -0,0 +1,104 @@
+# https://golangci-lint.run/usage/configuration/
+version: "2"
+
+run:
+  concurrency: 4
+  timeout: 10m
+
+issues:
+  # Show all errors.
+  max-issues-per-linter: 0
+  max-same-issues: 0
+  exclude:
+    - "don't use an underscore in package name"
+
+output:
+  sort-results: true
+
+exclusions:
+  paths:
+    - "^staging/.*"
+    - "^zz_generated.*"
+
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(kubevirt.io/containerized-data-importer/)
+    gofumpt:
+      extra-rules: true
+    goimports:
+      local-prefixes: kubevirt.io/containerized-data-importer/
+
+linters:
+  default: none
+  enable:
+    - asciicheck
+    - bidichk
+    - bodyclose
+    - contextcheck
+    - copyloopvar
+    - dogsled
+    - errcheck
+    - errname
+    - errorlint
+    - gocritic
+    - govet
+    - ineffassign
+    - misspell
+    - nolintlint
+    - reassign
+    - revive
+    - staticcheck
+    - testifylint
+    - unconvert
+    - unparam
+    - unused
+    - usetesting
+    - testableexamples
+    - thelper
+    - tparallel
+    - whitespace
+    - wastedassign
+    - importas
+  settings:
+    errcheck:
+      exclude-functions:
+        - "(*os.File).Close"
+        - "(*net.TCPConn).Close"
+        - "(io.ReadCloser).Close"
+        - "(net.Listener).Close"
+        - "(net.Conn).Close"
+        - "(*golang.org/x/crypto/ssh.Session).Close"
+        - "(*github.com/fsnotify/fsnotify.Watcher).Close"
+    staticcheck:
+      dot-import-whitelist:
+        - github.com/onsi/ginkgo/v2
+        - github.com/onsi/gomega
+    revive:
+      rules:
+        - name: dot-imports
+          disabled: true
+        - name: exported
+          disabled: true
+        - name: package-comments
+          disabled: true
+    nolintlint:
+      allow-no-explanation: [funlen, gocognit, lll]
+      require-explanation: true
+      require-specific: true
+    importas:
+      no-unaliased: true
+      no-extra-aliases: false
+      alias:
+        - pkg: k8s.io/api/core/v1
+          alias: corev1
+        - pkg: k8s.io/apimachinery/pkg/api/resource
+          alias: ""