test(CNV-43603): add disk-uploader functional tests

automation/e2e-deploy-resources.sh

@@ -40,7 +40,7 @@ kubectl apply -f "https://github.com/kubevirt/kubevirt/releases/download/${KUBEV
 
 kubectl apply -f "https://github.com/kubevirt/kubevirt/releases/download/${KUBEVIRT_VERSION}/kubevirt-cr.yaml"
 
-kubectl patch kubevirt kubevirt -n kubevirt --type merge -p '{"spec":{"configuration":{"developerConfiguration":{"featureGates": ["DataVolumes"]}}}}'
+kubectl patch kubevirt kubevirt -n kubevirt --type merge -p '{"spec":{"configuration":{"developerConfiguration":{"featureGates": ["DataVolumes", "VMExport"]}}}}'
 
 # Deploy Storage
 kubectl apply -f "https://github.com/kubevirt/containerized-data-importer/releases/download/${CDI_VERSION}/cdi-operator.yaml"

automation/e2e-source.sh

@@ -3,3 +3,6 @@
 export DEV_MODE="${DEV_MODE:-false}"
 export STORAGE_CLASS="${STORAGE_CLASS:-}"
 export NUM_NODES=${NUM_NODES:-2}
+export REGISTRY_IMAGE_DESTINATION="quay.io/kubevirt/e2e-tests-example-vm"
+export REGISTRY_ACCESS_KEY_ID=""
+export REGISTRY_SECRET_KEY=""

modules/disk-uploader/pkg/image/image.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"log"
 	"os"
+	"strconv"
 	"time"
 
 	"github.com/google/go-containerregistry/pkg/authn"
@@ -31,15 +32,20 @@ func Build(diskPath string) (v1.Image, error) {
 	return image, nil
 }
 
-func Push(image v1.Image, imageDestination string, pushTimeout int) error {
-	ctx, cancel := context.WithTimeout(context.Background(), time.Minute*time.Duration(pushTimeout))
+func Push(image v1.Image, imageDestination string, pushTimeout string) error {
+	timeout, err := strconv.Atoi(pushTimeout)
+	if err != nil {
+		log.Fatalf("Invalid push timeout value: %v", err)
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), time.Minute*time.Duration(timeout))
 	defer cancel()
 
 	auth := &authn.Basic{
 		Username: os.Getenv("ACCESS_KEY_ID"),
 		Password: os.Getenv("SECRET_KEY"),
 	}
-	err := crane.Push(image, imageDestination, crane.WithAuth(auth), crane.WithContext(ctx))
+	err = crane.Push(image, imageDestination, crane.WithAuth(auth), crane.WithContext(ctx))
 	if err != nil {
 		log.Fatalf("Error pushing image: %v", err)
 		return err

modules/disk-uploader/pkg/parse/clioptions.go

@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	defaultPushTimeout = 120
+	defaultPushTimeout = "120"
 )
 
 type CLIOptions struct {
@@ -18,7 +18,7 @@ type CLIOptions struct {
 	ExportSourceName      string `arg:"--export-source-name" help:"Name of the export source"`
 	VolumeName            string `arg:"--volumename" help:"Name of the volume (if source kind is 'pvc', then volume name is equal to source name)"`
 	ImageDestination      string `arg:"--imagedestination" help:"Destination of the image in container registry"`
-	PushTimeout           int    `arg:"--pushtimeout" help:"Push timeout of container disk to registry"`
+	PushTimeout           string `arg:"--pushtimeout" help:"Push timeout of container disk to registry"`
 	Debug                 bool   `arg:"--debug" help:"Sets DEBUG log level"`
 }
 
@@ -42,7 +42,7 @@ func (c *CLIOptions) GetImageDestination() string {
 	return c.ImageDestination
 }
 
-func (c *CLIOptions) GetPushTimeout() int {
+func (c *CLIOptions) GetPushTimeout() string {
 	return c.PushTimeout
 }
 
@@ -91,7 +91,7 @@ func (c *CLIOptions) setValues() error {
 		c.ExportSourceNamespace = namespace
 	}
 
-	if c.PushTimeout == 0 {
+	if c.PushTimeout == "" || c.PushTimeout == "0" {
 		c.PushTimeout = defaultPushTimeout
 	}
 	return nil

modules/disk-uploader/pkg/parse/clioptions_test.go

@@ -39,7 +39,7 @@ var _ = Describe("CLIOptions", func() {
 				ExportSourceName:      expectedExportSourceName,
 				VolumeName:            expectedVolumeName,
 				ImageDestination:      expectedImageDestination,
-				PushTimeout:           60,
+				PushTimeout:           "60",
 				Debug:                 true,
 			}
 			Expect(options.Init()).To(Succeed())
@@ -52,7 +52,7 @@ var _ = Describe("CLIOptions", func() {
 				ExportSourceName:      " " + expectedExportSourceName + " ",
 				VolumeName:            " " + expectedVolumeName + " ",
 				ImageDestination:      " " + expectedImageDestination + " ",
-				PushTimeout:           60,
+				PushTimeout:           "60",
 				Debug:                 true,
 			}
 

test/disk_uploader_test.go

@@ -0,0 +1,112 @@
+package test
+
+import (
+	"context"
+	"os"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	kubeclientcorev1 "k8s.io/client-go/kubernetes/typed/core/v1"
+
+	v1 "kubevirt.io/api/core/v1"
+	kubevirtcliv1 "kubevirt.io/client-go/kubecli"
+	cdiv1beta1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
+	"kubevirt.io/kubevirt/pkg/libvmi"
+	"kubevirt.io/kubevirt/tests/libdv"
+
+	"github.com/kubevirt/kubevirt-tekton-tasks/test/constants"
+	"github.com/kubevirt/kubevirt-tekton-tasks/test/framework"
+	"github.com/kubevirt/kubevirt-tekton-tasks/test/runner"
+	"github.com/kubevirt/kubevirt-tekton-tasks/test/testconfigs"
+	"github.com/kubevirt/kubevirt-tekton-tasks/test/vm"
+)
+
+var _ = Describe("Run disk-uploader", func() {
+	f := framework.NewFramework()
+
+	BeforeEach(func() {
+		if f.TestOptions.SkipDiskUploaderTests {
+			Skip("skipDiskUploaderTests is set to true, skipping tests")
+		}
+	})
+
+	It("Extracts disk from VM and upload to container registry", func() {
+		imageDestination := os.Getenv("REGISTRY_IMAGE_DESTINATION")
+		Expect(imageDestination).ToNot(BeEmpty())
+
+		registryCredentials, err := createRegistryCredentials(f.CoreV1Client, f.DeployNamespace)
+		Expect(err).ToNot(HaveOccurred())
+
+		cirrosVm, err := createCirrosVM(f.KubevirtClient, f.DeployNamespace)
+		Expect(err).ToNot(HaveOccurred())
+
+		_, err = vm.WaitForVM(f.KubevirtClient, f.DeployNamespace, cirrosVm.Name, "", constants.Timeouts.WaitForVMStart.Duration, false)
+		Expect(err).ToNot(HaveOccurred())
+
+		config := &testconfigs.DiskUploaderTestConfig{
+			TaskRunTestConfig: testconfigs.TaskRunTestConfig{},
+			TaskData: testconfigs.DiskUploaderTaskData{
+				ExportSourceKind: "vm",
+				ExportSourceName: cirrosVm.Name,
+				VolumeName:       cirrosVm.Spec.Template.Spec.Volumes[0].DataVolume.Name,
+				ImageDestination: imageDestination,
+				SecretName:       registryCredentials.Name,
+			},
+		}
+		f.TestSetup(config)
+
+		runner.NewTaskRunRunner(f, config.GetTaskRun()).
+			CreateTaskRun().
+			ExpectSuccess().
+			ExpectLogs(config.GetAllExpectedLogs()...).
+			ExpectResults(nil)
+	})
+})
+
+func createRegistryCredentials(client kubeclientcorev1.CoreV1Interface, namespace string) (*corev1.Secret, error) {
+	registryKeyId := os.Getenv("REGISTRY_ACCESS_KEY_ID")
+	Expect(registryKeyId).ToNot(BeEmpty())
+
+	registryKey := os.Getenv("REGISTRY_SECRET_KEY")
+	Expect(registryKey).ToNot(BeEmpty())
+
+	v1Secret := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: constants.E2ETestsRandomName("disk-uploader-credentials"),
+		},
+		Type: corev1.SecretTypeOpaque,
+		Data: map[string][]byte{
+			"accessKeyId": []byte(registryKeyId),
+			"secretKey":   []byte(registryKey),
+		},
+	}
+
+	return client.Secrets(namespace).Create(context.Background(), v1Secret, metav1.CreateOptions{})
+}
+
+func createCirrosVM(client kubevirtcliv1.KubevirtClient, namespace string) (*v1.VirtualMachine, error) {
+	dataVolume := libdv.NewDataVolume(
+		libdv.WithRegistryURLSource("docker://quay.io/kubevirt/cirros-container-disk-demo"),
+		libdv.WithForceBindAnnotation(),
+	)
+	dataVolume.Spec.Storage = &cdiv1beta1.StorageSpec{
+		Resources: corev1.ResourceRequirements{
+			Requests: corev1.ResourceList{
+				"storage": resource.MustParse("512Mi"),
+			},
+		},
+	}
+	v1VirtualMachine := libvmi.NewVirtualMachine(
+		libvmi.New(
+			libvmi.WithDataVolume("datavolumedisk", dataVolume.Name),
+			libvmi.WithResourceMemory("256M"),
+		),
+		libvmi.WithDataVolumeTemplate(dataVolume),
+	)
+
+	return client.VirtualMachine(namespace).Create(context.Background(), v1VirtualMachine, metav1.CreateOptions{})
+}

test/framework/testoptions/test-options.go

@@ -19,6 +19,7 @@ var isOKD string
 var skipCreateVMFromManifestTests string
 var skipExecuteInVMTests string
 var skipGenerateSSHKeysTests string
+var skipDiskUploaderTests string
 
 type TestOptions struct {
 	DeployNamespace               string
@@ -29,6 +30,7 @@ type TestOptions struct {
 	SkipCreateVMFromManifestTests bool
 	SkipExecuteInVMTests          bool
 	SkipGenerateSSHKeysTests      bool
+	SkipDiskUploaderTests         bool
 
 	CommonTemplatesVersion string
 }
@@ -42,6 +44,7 @@ func init() {
 	flag.StringVar(&skipCreateVMFromManifestTests, "skip-create-vm-from-manifests-tests", "", "Skip create vm from manifests test suite. One of: true|false")
 	flag.StringVar(&skipExecuteInVMTests, "skip-execute-in-vm-tests", "", "Skip execute in vm test suite. One of: true|false")
 	flag.StringVar(&skipGenerateSSHKeysTests, "skip-generate-ssh-keys-tests", "", "Skip generate ssh keys suite. One of: true|false")
+	flag.StringVar(&skipDiskUploaderTests, "skip-disk-uploader-tests", "", "Skip disk uploader suite. One of: true|false")
 }
 
 func InitTestOptions(testOptions *TestOptions) error {
@@ -72,6 +75,7 @@ func InitTestOptions(testOptions *TestOptions) error {
 	testOptions.SkipCreateVMFromManifestTests = strings.ToLower(skipCreateVMFromManifestTests) == "true"
 	testOptions.SkipExecuteInVMTests = strings.ToLower(skipExecuteInVMTests) == "true"
 	testOptions.SkipGenerateSSHKeysTests = strings.ToLower(skipGenerateSSHKeysTests) == "true"
+	testOptions.SkipDiskUploaderTests = strings.ToLower(skipDiskUploaderTests) == "true"
 
 	return nil
 }

test/testconfigs/disk-uploader-config.go

@@ -0,0 +1,91 @@
+package testconfigs
+
+import (
+	pipev1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/kubevirt/kubevirt-tekton-tasks/test/constants"
+	"github.com/kubevirt/kubevirt-tekton-tasks/test/framework/testoptions"
+)
+
+type DiskUploaderTaskData struct {
+	ExportSourceKind string
+	ExportSourceName string
+	VolumeName       string
+	ImageDestination string
+	PushTimeout      string
+	SecretName       string
+}
+
+type DiskUploaderTestConfig struct {
+	TaskRunTestConfig
+	TaskData DiskUploaderTaskData
+
+	deploymentNamespace string
+}
+
+func (c *DiskUploaderTestConfig) Init(options *testoptions.TestOptions) {
+	c.deploymentNamespace = options.DeployNamespace
+}
+
+func (c *DiskUploaderTestConfig) GetTaskRun() *pipev1.TaskRun {
+	params := []pipev1.Param{
+		{
+			Name: "EXPORT_SOURCE_KIND",
+			Value: pipev1.ParamValue{
+				Type:      pipev1.ParamTypeString,
+				StringVal: c.TaskData.ExportSourceKind,
+			},
+		},
+		{
+			Name: "EXPORT_SOURCE_NAME",
+			Value: pipev1.ParamValue{
+				Type:      pipev1.ParamTypeString,
+				StringVal: c.TaskData.ExportSourceName,
+			},
+		},
+		{
+			Name: "VOLUME_NAME",
+			Value: pipev1.ParamValue{
+				Type:      pipev1.ParamTypeString,
+				StringVal: c.TaskData.VolumeName,
+			},
+		},
+		{
+			Name: "IMAGE_DESTINATION",
+			Value: pipev1.ParamValue{
+				Type:      pipev1.ParamTypeString,
+				StringVal: c.TaskData.ImageDestination,
+			},
+		},
+		{
+			Name: "PUSH_TIMEOUT",
+			Value: pipev1.ParamValue{
+				Type:      pipev1.ParamTypeString,
+				StringVal: c.TaskData.PushTimeout,
+			},
+		},
+		{
+			Name: "SECRET_NAME",
+			Value: pipev1.ParamValue{
+				Type:      pipev1.ParamTypeString,
+				StringVal: c.TaskData.SecretName,
+			},
+		},
+	}
+
+	return &pipev1.TaskRun{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      constants.E2ETestsRandomName("taskrun-disk-uploader"),
+			Namespace: c.deploymentNamespace,
+		},
+		Spec: pipev1.TaskRunSpec{
+			TaskRef: &pipev1.TaskRef{
+				Name: "disk-uploader",
+				Kind: pipev1.NamespacedTaskKind,
+			},
+			Timeout: &metav1.Duration{Duration: c.GetTaskRunTimeout()},
+			Params:  params,
+		},
+	}
+}