refactor(CNV-47155): make VM_NAMESPACE env var optionally

Make VM_NAMESPACE environment
variable optionally and instead use parameter
that is passed by the user if needed.

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, Image Destination, 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 Namespace, 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):
@@ -24,6 +24,8 @@ Deploy `kubevirt-disk-uploader` within the same namespace as the Virtual Machine
 kubectl apply -f kubevirt-disk-uploader.yaml -n $VM_NAMESPACE
 ```
 
+**Note**: If both `VM_NAMESPACE` and `--vmnamespace` argument are set, `VM_NAMESPACE` will be used.
+
 ## KubeVirt Documentation
 
 Read more about the used API at [KubeVirt Export API](https://kubevirt.io/user-guide/operations/export_api).

examples/kubevirt-disk-uploader-tekton.yaml

@@ -182,6 +182,10 @@ spec:
         secretKeyRef:
           name: kubevirt-disk-uploader-credentials-tekton
           key: registryPassword
+    - name: VM_NAMESPACE
+      valueFrom:
+        fieldRef:
+          fieldPath: metadata.namespace
     command: ["/usr/local/bin/kubevirt-disk-uploader"]
     args:
     - "--vmname"

kubevirt-disk-uploader.yaml

@@ -49,6 +49,10 @@ spec:
             secretKeyRef:
               name: kubevirt-disk-uploader-credentials
               key: registryPassword
+        - name: VM_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
       command: ["/usr/local/bin/kubevirt-disk-uploader"]
       # args: ["--vmname", "example-vm", "--volumename", "datavolumedisk", "--imagedestination", "quay.io/boukhano/example-vm-exported:latest", "--enablevirtsysprep", "false", "--pushtimeout", "120"]
       resources:

main.go

@@ -31,22 +31,27 @@ const (
 	diskPathConverted    string = "./tmp/disk.qcow2"
 )
 
-func applyVirtualMachineExport(vmName string) error {
+func applyVirtualMachineExport(vmNamespace, vmName string) error {
 	log.Println("Applying VirtualMachineExport object...")
 
 	client, err := kubecli.GetKubevirtClient()
 	if err != nil {
 		return err
 	}
 
-	vmNamespace := os.Getenv("VM_NAMESPACE")
+	env := os.Getenv("VM_NAMESPACE")
+	if env != "" {
+		vmNamespace = env
+	}
+
 	if vmNamespace == "" {
-		return fmt.Errorf("VM namespace is not defined. Set VM_NAMESPACE.")
+		return fmt.Errorf("VM namespace is not defined. Set VM_NAMESPACE or parameter.")
 	}
 
 	vmExport := &v1beta1.VirtualMachineExport{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: vmName,
+			Name:      vmName,
+			Namespace: vmNamespace,
 		},
 		Spec: v1beta1.VirtualMachineExportSpec{
 			Source: corev1.TypedLocalObjectReference{
@@ -175,8 +180,8 @@ func pushContainerDisk(image v1.Image, imageDestination string, pushTimeout int)
 	return nil
 }
 
-func run(vmName, volumeName, imageDestination, enableVirtSysprep string, pushTimeout int) error {
-	if err := applyVirtualMachineExport(vmName); err != nil {
+func run(vmNamespace, vmName, volumeName, imageDestination, enableVirtSysprep string, pushTimeout int) error {
+	if err := applyVirtualMachineExport(vmNamespace, vmName); err != nil {
 		return err
 	}
 
@@ -205,6 +210,7 @@ func run(vmName, volumeName, imageDestination, enableVirtSysprep string, pushTim
 }
 
 func main() {
+	var vmNamespace string
 	var vmName string
 	var volumeName string
 	var imageDestination string
@@ -217,14 +223,15 @@ 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, imageDestination, enableVirtSysprep, pushTimeout); err != nil {
+			if err := run(vmNamespace, vmName, volumeName, imageDestination, enableVirtSysprep, pushTimeout); err != nil {
 				log.Panicln(err)
 			}
 
 			log.Println("Succesfully extracted disk image and uploaded it in a new container image to container registry.")
 		},
 	}
 
+	command.Flags().StringVar(&vmNamespace, "vmnamespace", "", "namespace of the virtual machine")
 	command.Flags().StringVar(&vmName, "vmname", "", "name of the virtual machine")
 	command.Flags().StringVar(&volumeName, "volumename", "", "volume name of the virtual machine")
 	command.Flags().StringVar(&imageDestination, "imagedestination", "", "destination of the image in container registry")

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

@@ -45,6 +45,10 @@ spec:
         secretKeyRef:
           name: kubevirt-disk-uploader-credentials-tekton
           key: registryPassword
+    - name: VM_NAMESPACE
+      valueFrom:
+        fieldRef:
+          fieldPath: metadata.namespace
     command: ["/usr/local/bin/kubevirt-disk-uploader"]
     args:
     - "--vmname"