refactor: use image destination variable

Use image destination that is provided by
the user and not constructed from provided
variables.

Jira-Url: https://issues.redhat.com/browse/CNV-36060
Signed-off-by: Ben Oukhanov <[email protected]>

Author: codingben

README.md

@@ -15,7 +15,7 @@ KubeVirt Disk Uploader -> Download VM Disk -> Build New Container Disk -> Push T
 **Prerequisites**
 
 1. Ensure Virtual Machine (VM) is powered off. Data from VM can be exported only when it is not used.
-2. Modify [kubevirt-disk-uploader](https://github.com/codingben/kubevirt-disk-uploader/blob/main/kubevirt-disk-uploader.yaml#L58) arguments (VM Name, Volume Name, New Container Disk Name, Enable or Disable System Preparation and Push Timeout).
+2. Modify [kubevirt-disk-uploader](https://github.com/codingben/kubevirt-disk-uploader/blob/main/kubevirt-disk-uploader.yaml#L58) arguments (VM Name, Volume Name, Image Destination, Enable or Disable System Preparation and Push Timeout).
 3. Modify [kubevirt-disk-uploader-credentials](https://github.com/codingben/kubevirt-disk-uploader/blob/main/kubevirt-disk-uploader.yaml#L65-L74) of the external container registry (Username, Password and Hostname).
 
 Deploy `kubevirt-disk-uploader` within the same namespace as the Virtual Machine (VM):

examples/kubevirt-disk-uploader-tekton.yaml

@@ -146,7 +146,6 @@ type: Opaque
 data:
   registryUsername: "<REGISTRY_USERNAME>"
   registryPassword: "<REGISTRY_PASSWORD>"
-  registryHostname: "<REGISTRY_HOSTNAME>"
 ---
 apiVersion: tekton.dev/v1
 kind: Task
@@ -160,8 +159,8 @@ spec:
   - name: VOLUME_NAME
     description: The volume name of the virtual machine
     type: string
-  - name: CONTAINER_DISK_NAME
-    description: The name of the new image
+  - name: IMAGE_DESTINATION
+    description: Destination of the image in container registry
     type: string
   - name: ENABLE_VIRT_SYSPREP
     description: Enable or disable preparation of disk image
@@ -183,19 +182,14 @@ spec:
         secretKeyRef:
           name: kubevirt-disk-uploader-credentials-tekton
           key: registryPassword
-    - name: REGISTRY_HOST
-      valueFrom:
-        secretKeyRef:
-          name: kubevirt-disk-uploader-credentials-tekton
-          key: registryHostname
     command: ["/usr/local/bin/kubevirt-disk-uploader"]
     args:
     - "--vmname"
     - $(params.VM_NAME)
     - "--volumename"
     - $(params.VOLUME_NAME)
-    - "--containerdiskname"
-    - $(params.CONTAINER_DISK_NAME)
+    - "--imagedestination"
+    - $(params.IMAGE_DESTINATION)
     - "--enablevirtsysprep"
     - $(params.ENABLE_VIRT_SYSPREP)
     - "--pushtimeout"
@@ -218,8 +212,8 @@ spec:
   - name: VOLUME_NAME
     description: "Volume name of the virtual machine"
     type: string
-  - name: CONTAINER_DISK_NAME
-    description: "Name of the new image"
+  - name: IMAGE_DESTINATION
+    description: "Destination of the image in container registry"
     type: string
   - name: ENABLE_VIRT_SYSPREP
     description: "Enable or disable preparation of disk image"
@@ -241,8 +235,8 @@ spec:
       value: "$(params.VM_NAME)"
     - name: VOLUME_NAME
       value: "$(params.VOLUME_NAME)"
-    - name: CONTAINER_DISK_NAME
-      value: "$(params.CONTAINER_DISK_NAME)"
+    - name: IMAGE_DESTINATION
+      value: "$(params.IMAGE_DESTINATION)"
     - name: ENABLE_VIRT_SYSPREP
       value: "$(params.ENABLE_VIRT_SYSPREP)"
     - name: PUSH_TIMEOUT
@@ -265,8 +259,8 @@ spec:
     value: example-vm-tekton
   - name: VOLUME_NAME
     value: datavolumedisk
-  - name: CONTAINER_DISK_NAME
-    value: example-vm-tekton-exported:latest
+  - name: IMAGE_DESTINATION
+    value: quay.io/boukhano/example-vm-tekton-exported:latest
   - name: ENABLE_VIRT_SYSPREP
     value: true
   - name: PUSH_TIMEOUT

kubevirt-disk-uploader.yaml

@@ -49,13 +49,8 @@ spec:
             secretKeyRef:
               name: kubevirt-disk-uploader-credentials
               key: registryPassword
-        - name: REGISTRY_HOST
-          valueFrom:
-            secretKeyRef:
-              name: kubevirt-disk-uploader-credentials
-              key: registryHostname
       command: ["/usr/local/bin/kubevirt-disk-uploader"]
-      # args: ["--vmname", "example-vm", "--volumename", "datavolumedisk", "--containerdiskname", "example-vm-exported:latest", "--enablevirtsysprep", "false", "--pushtimeout", "120"]
+      # args: ["--vmname", "example-vm", "--volumename", "datavolumedisk", "--imagedestination", "quay.io/boukhano/example-vm-exported:latest", "--enablevirtsysprep", "false", "--pushtimeout", "120"]
       resources:
         requests:
           memory: 3Gi
@@ -71,4 +66,3 @@ type: Opaque
 data:
   registryUsername: "<REGISTRY_USERNAME>"
   registryPassword: "<REGISTRY_PASSWORD>"
-  registryHostname: "<REGISTRY_HOSTNAME>"

main.go

@@ -145,19 +145,17 @@ func buildContainerDisk(diskPath string) (v1.Image, error) {
 	return image, nil
 }
 
-func pushContainerDisk(image v1.Image, containerDiskName string, pushTimeout int) error {
+func pushContainerDisk(image v1.Image, imageDestination string, pushTimeout int) error {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Minute*time.Duration(pushTimeout))
 	defer cancel()
 
-	hostName := os.Getenv("REGISTRY_HOST")
 	userName := os.Getenv("REGISTRY_USERNAME")
 	password := os.Getenv("REGISTRY_PASSWORD")
 	auth := &authn.Basic{
 		Username: userName,
 		Password: password,
 	}
 
-	imageDestination := fmt.Sprintf("%s/%s/%s", hostName, userName, containerDiskName)
 	err := crane.Push(image, imageDestination, crane.WithAuth(auth), crane.WithContext(ctx))
 	if err != nil {
 		log.Fatalf("Error pushing image: %v", err)
@@ -168,7 +166,7 @@ func pushContainerDisk(image v1.Image, containerDiskName string, pushTimeout int
 	return nil
 }
 
-func run(vmName, volumeName, containerDiskName, enableVirtSysprep string, pushTimeout int) error {
+func run(vmName, volumeName, imageDestination, enableVirtSysprep string, pushTimeout int) error {
 	if err := applyVirtualMachineExport(vmName); err != nil {
 		return err
 	}
@@ -194,13 +192,13 @@ func run(vmName, volumeName, containerDiskName, enableVirtSysprep string, pushTi
 		return err
 	}
 
-	return pushContainerDisk(image, containerDiskName, pushTimeout)
+	return pushContainerDisk(image, imageDestination, pushTimeout)
 }
 
 func main() {
 	var vmName string
 	var volumeName string
-	var containerDiskName string
+	var imageDestination string
 	var enableVirtSysprep string
 	var pushTimeout int
 
@@ -210,7 +208,7 @@ func main() {
 		Run: func(cmd *cobra.Command, args []string) {
 			log.Println("Extracts disk and uploads it to a container registry...")
 
-			if err := run(vmName, volumeName, containerDiskName, enableVirtSysprep, pushTimeout); err != nil {
+			if err := run(vmName, volumeName, imageDestination, enableVirtSysprep, pushTimeout); err != nil {
 				log.Panicln(err)
 			}
 
@@ -220,12 +218,12 @@ func main() {
 
 	command.Flags().StringVar(&vmName, "vmname", "", "name of the virtual machine")
 	command.Flags().StringVar(&volumeName, "volumename", "", "volume name of the virtual machine")
-	command.Flags().StringVar(&containerDiskName, "containerdiskname", "", "name of the new container image")
+	command.Flags().StringVar(&imageDestination, "imagedestination", "", "destination of the image in container registry")
 	command.Flags().StringVar(&enableVirtSysprep, "enablevirtsysprep", "false", "enable or disable virt-sysprep")
 	command.Flags().IntVar(&pushTimeout, "pushtimeout", 60, "containerdisk push timeout in minutes")
 	command.MarkFlagRequired("vmname")
 	command.MarkFlagRequired("volumename")
-	command.MarkFlagRequired("containerDiskName")
+	command.MarkFlagRequired("imagedestination")
 
 	if err := command.Execute(); err != nil {
 		log.Println(err)

task/0.5.0/README.md

@@ -16,7 +16,7 @@ kubectl apply -f https://raw.githubusercontent.com/codingben/kubevirt-disk-uploa
 
 - **VM_NAME**: The name of the virtual machine
 - **VOLUME_NAME**: The volume name of the virtual machine
-- **CONTAINER_DISK_NAME**: The name of the new image
+- **IMAGE_DESTINATION**: Destination of the image in container registry
 - **ENABLE_VIRT_SYSPREP**: Enable or disable preparation of disk image
 - **PUSH_TIMEOUT**: ContainerDisk push timeout in minutes
 
@@ -36,7 +36,6 @@ type: Opaque
 data:
   registryUsername: "<REGISTRY_USERNAME>"
   registryPassword: "<REGISTRY_PASSWORD>"
-  registryHostname: "<REGISTRY_HOSTNAME>"
 ```
 
 TaskRun:
@@ -54,8 +53,8 @@ spec:
     value: <VM_NAME_VALUE>
   - name: VOLUME_NAME
     value: <VOLUME_NAME_VALUE>
-  - name: CONTAINER_DISK_NAME
-    value: <CONTAINER_DISK_NAME_VALUE>
+  - name: IMAGE_DESTINATION
+    value: <IMAGE_DESTINATION_VALUE>
   - name: ENABLE_VIRT_SYSPREP
     value: <ENABLE_VIRT_SYSPREP_VALUE>
   - name: PUSH_TIMEOUT

task/0.5.0/kubevirt-disk-uploader-task.yaml

@@ -19,8 +19,8 @@ spec:
   - name: VOLUME_NAME
     description: The volume name of the virtual machine
     type: string
-  - name: CONTAINER_DISK_NAME
-    description: The name of the new image
+  - name: IMAGE_DESTINATION
+    description: Destination of the image in container registry
     type: string
   - name: ENABLE_VIRT_SYSPREP
     description: Enable or disable preparation of disk image
@@ -42,19 +42,14 @@ spec:
         secretKeyRef:
           name: kubevirt-disk-uploader-credentials-tekton
           key: registryPassword
-    - name: REGISTRY_HOST
-      valueFrom:
-        secretKeyRef:
-          name: kubevirt-disk-uploader-credentials-tekton
-          key: registryHostname
     command: ["/usr/local/bin/kubevirt-disk-uploader"]
     args:
     - "--vmname"
     - $(params.VM_NAME)
     - "--volumename"
     - $(params.VOLUME_NAME)
-    - "--containerdiskname"
-    - $(params.CONTAINER_DISK_NAME)
+    - "--imagedestination"
+    - $(params.IMAGE_DESTINATION)
     - "--enablevirtsysprep"
     - $(params.ENABLE_VIRT_SYSPREP)
     - "--pushtimeout"

task/0.5.0/tests/kubevirt-disk-uploader-secret.yaml

@@ -7,4 +7,3 @@ type: Opaque
 data:
   registryUsername: "<REGISTRY_USERNAME>"
   registryPassword: "<REGISTRY_PASSWORD>"
-  registryHostname: "<REGISTRY_HOSTNAME>"

task/0.5.0/tests/kubevirt-disk-uploader-task-run.yaml

@@ -10,8 +10,8 @@ spec:
     value: example-vm-tekton
   - name: VOLUME_NAME
     value: datavolumedisk
-  - name: CONTAINER_DISK_NAME
-    value: example-vm-tekton-exported:latest
+  - name: IMAGE_DESTINATION
+    value: quay.io/boukhano/example-vm-tekton-exported:latest
   - name: ENABLE_VIRT_SYSPREP
     value: false
   - name: PUSH_TIMEOUT