Add args to node-labeller script and pass KVM vals

Add cmdline args to the node-labeller.sh script to specify the
hypervisor device (e.g., kvm or mshv) and the LibVirt virt-type
of VMs on that hypervisor. Update the defn of the virt-handler
daemonset to pass the default KVM-specific values to the script.

Signed-off-by: Harshit Gupta <guptaharshit@microsoft.com>

Author: Harshit Gupta

cmd/virt-launcher/node-labeller/node-labeller.sh

@@ -2,6 +2,23 @@
 
 set -xeo pipefail
 
+while getopts d:t: flag; do
+    case "${flag}" in
+    d) HYPERVISOR_DEVICE=${OPTARG} ;;
+    t) PREFERRED_VIRTTYPE=${OPTARG} ;;
+    *)
+        echo "Invalid option"
+        exit 1
+        ;;
+    esac
+done
+
+if [ -z "$HYPERVISOR_DEVICE" ] || [ -z "$PREFERRED_VIRTTYPE" ]; then
+    echo "Error: Missing required arguments."
+    echo "Usage: $0 -d <HYPERVISOR_DEVICE> -t <PREFERRED_VIRTTYPE>"
+    exit 1
+fi
+
 ARCH=$(uname -m)
 MACHINE=q35
 if [ "$ARCH" == "aarch64" ]; then
@@ -14,19 +31,19 @@ fi
 
 set +o pipefail
 
-KVM_MINOR=$(grep -w 'kvm' /proc/misc | cut -f 1 -d' ')
+HYPERVISOR_DEV_PATH="/dev/${HYPERVISOR_DEVICE}"
+HYPERVISOR_DEV_MINOR=$(grep -w ${HYPERVISOR_DEVICE} /proc/misc | cut -f 1 -d' ')
 set -o pipefail
 
 VIRTTYPE=qemu
 
-
-if [ ! -e /dev/kvm ] && [ -n "$KVM_MINOR" ]; then
-  mknod /dev/kvm c 10 $KVM_MINOR
+if [ ! -e "$HYPERVISOR_DEV_PATH" ] && [ -n "$HYPERVISOR_DEV_MINOR" ]; then
+  mknod "$HYPERVISOR_DEV_PATH" c 10 "$HYPERVISOR_DEV_MINOR"
 fi
 
-if [ -e /dev/kvm ]; then
-    chmod o+rw /dev/kvm
-    VIRTTYPE=kvm
+if [ -e "$HYPERVISOR_DEV_PATH" ]; then
+    chmod o+rw "$HYPERVISOR_DEV_PATH"
+    VIRTTYPE=${PREFERRED_VIRTTYPE}
 fi
 
 if [ -e /dev/sev ]; then

pkg/virt-operator/resource/generate/components/BUILD.bazel

@@ -28,6 +28,7 @@ go_library(
         "//pkg/certificates/bootstrap:go_default_library",
         "//pkg/certificates/triple:go_default_library",
         "//pkg/certificates/triple/cert:go_default_library",
+        "//pkg/hypervisor/kvm:go_default_library",
         "//pkg/pointer:go_default_library",
         "//pkg/storage/reservation:go_default_library",
         "//pkg/util:go_default_library",

pkg/virt-operator/resource/generate/components/daemonsets.go

@@ -13,6 +13,7 @@ import (
 
 	virtv1 "kubevirt.io/api/core/v1"
 
+	"kubevirt.io/kubevirt/pkg/hypervisor/kvm"
 	"kubevirt.io/kubevirt/pkg/pointer"
 	"kubevirt.io/kubevirt/pkg/storage/reservation"
 	"kubevirt.io/kubevirt/pkg/util"
@@ -137,6 +138,8 @@ func NewHandlerDaemonSet(config *operatorutil.KubeVirtDeploymentConfig, productN
 	pod.ServiceAccountName = HandlerServiceAccountName
 	pod.HostPID = true
 
+	launcherHypervisorResources := kvm.NewKvmLauncherHypervisorResources()
+
 	// nodelabeller currently only support x86. The arch check will be done in node-labller.sh
 	pod.InitContainers = []corev1.Container{
 		{
@@ -147,7 +150,7 @@ func NewHandlerDaemonSet(config *operatorutil.KubeVirtDeploymentConfig, productN
 			Image: launcherImage,
 			Name:  "virt-launcher",
 			Args: []string{
-				"node-labeller.sh",
+				fmt.Sprintf("node-labeller.sh -d %s -t %s", launcherHypervisorResources.GetHypervisorDevice(), launcherHypervisorResources.GetVirtType()),
 			},
 			SecurityContext: &corev1.SecurityContext{
 				Privileged: pointer.P(true),