Merge pull request #17 from moadqassem/pre-allocated-datavolume-support

referencing pre-allocated data volumes in vms
gardener-attic · Sep 21, 2020 · f3600b1 · f3600b1
2 parents 0c2b5f3 + 22b8fba
commit f3600b1
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 23 deletions.
diff --git a/cmd/machine-controller/main.go b/cmd/machine-controller/main.go
@@ -26,8 +26,10 @@ import (
 	_ "github.com/gardener/machine-controller-manager/pkg/util/reflector/prometheus" // for reflector metric registration
 	_ "github.com/gardener/machine-controller-manager/pkg/util/workqueue/prometheus" // for workqueue metric registration
 	"github.com/spf13/pflag"
+	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/component-base/cli/flag"
 	"k8s.io/component-base/logs"
+	cdi "kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1"
 )
 
 func main() {
@@ -39,6 +41,11 @@ func main() {
 	logs.InitLogs()
 	defer logs.FlushLogs()
 
+	if err := cdi.AddToScheme(scheme.Scheme); err != nil {
+		fmt.Fprintf(os.Stderr, " %v\n", err)
+		os.Exit(1)
+	}
+
 	plugin := kubevirt.NewKubevirtPlugin()
 
 	if err := app.Run(s, plugin); err != nil {

diff --git a/pkg/kubevirt/core/core.go b/pkg/kubevirt/core/core.go
@@ -40,8 +40,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-// ProviderName specifies the machine controller for kubevirt cloud provider
-const ProviderName = "kubevirt"
+const (
+	// ProviderName specifies the machine controller for kubevirt cloud provider
+	ProviderName      = "kubevirt"
+	machineClassLabel = "mcm.gardener.cloud/machineclass"
+)
 
 // ClientFactory creates a client from the kubeconfig saved in the "kubeconfig" field of the given secret.
 type ClientFactory interface {
@@ -133,6 +136,44 @@ func (p PluginSPIImpl) CreateMachine(ctx context.Context, machineName string, pr
 	}
 	vmLabels["kubevirt.io/vm"] = machineName
 
+	machineClassName := vmLabels[machineClassLabel]
+	dataVolumeName, err := p.getDataVolume(ctx, c, machineClassName, namespace)
+	if err != nil {
+		return "", err
+	}
+
+	dataVolumeTemplate := cdi.DataVolume{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      machineName,
+			Namespace: namespace,
+		},
+		Spec: cdi.DataVolumeSpec{
+			PVC: &corev1.PersistentVolumeClaimSpec{
+				StorageClassName: utilpointer.StringPtr(providerSpec.StorageClassName),
+				AccessModes: []corev1.PersistentVolumeAccessMode{
+					"ReadWriteOnce",
+				},
+				Resources: corev1.ResourceRequirements{
+					Requests: pvcRequest,
+				},
+			},
+			Source: cdi.DataVolumeSource{
+				HTTP: &cdi.DataVolumeSourceHTTP{
+					URL: providerSpec.SourceURL,
+				},
+			},
+		},
+	}
+
+	if dataVolumeName != "" {
+		dataVolumeTemplate.Spec.Source = cdi.DataVolumeSource{
+			PVC: &cdi.DataVolumeSourcePVC{
+				Name:      dataVolumeName,
+				Namespace: namespace,
+			},
+		}
+	}
+
 	virtualMachine := &kubevirtv1.VirtualMachine{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      machineName,
@@ -195,27 +236,7 @@ func (p PluginSPIImpl) CreateMachine(ctx context.Context, machineName string, pr
 				},
 			},
 			DataVolumeTemplates: []cdi.DataVolume{
-				{
-					ObjectMeta: metav1.ObjectMeta{
-						Name: machineName,
-					},
-					Spec: cdi.DataVolumeSpec{
-						PVC: &corev1.PersistentVolumeClaimSpec{
-							StorageClassName: utilpointer.StringPtr(providerSpec.StorageClassName),
-							AccessModes: []corev1.PersistentVolumeAccessMode{
-								"ReadWriteOnce",
-							},
-							Resources: corev1.ResourceRequirements{
-								Requests: pvcRequest,
-							},
-						},
-						Source: cdi.DataVolumeSource{
-							HTTP: &cdi.DataVolumeSourceHTTP{
-								URL: providerSpec.SourceURL,
-							},
-						},
-					},
-				},
+				dataVolumeTemplate,
 			},
 		},
 	}
@@ -348,3 +369,15 @@ func (p PluginSPIImpl) listVMs(ctx context.Context, c client.Client, namespace s
 	}
 	return virtualMachineList, nil
 }
+
+func (p PluginSPIImpl) getDataVolume(ctx context.Context, c client.Client, dataVolumeName, namespace string) (string, error) {
+	dataVolume := &cdi.DataVolume{}
+	if err := c.Get(ctx, types.NamespacedName{Namespace: namespace, Name: dataVolumeName}, dataVolume); err != nil {
+		if kerrors.IsNotFound(err) {
+			return "", nil
+		}
+		return "", fmt.Errorf("failed to get DataVolume: %v", err)
+	}
+
+	return dataVolume.Name, nil
+}
diff --git a/pkg/kubevirt/core/core_test.go b/pkg/kubevirt/core/core_test.go
@@ -16,12 +16,15 @@ package core
 
 import (
 	"context"
+	"os"
 	"testing"
 
 	api "github.com/gardener/machine-controller-manager-provider-kubevirt/pkg/kubevirt/apis"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/klog"
+	cdi "kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
@@ -38,6 +41,13 @@ var (
 	namespace   = "default"
 )
 
+func init() {
+	if err := cdi.AddToScheme(scheme.Scheme); err != nil {
+		klog.Errorf("could not execute tests: %v", err)
+		os.Exit(1)
+	}
+}
+
 func TestPluginSPIImpl_CreateMachine(t *testing.T) {
 	fakeClient := fake.NewFakeClientWithScheme(scheme.Scheme)
 	t.Run("CreateMachine", func(t *testing.T) {