Merge pull request #1064 from yastij/storage-policy-capv

support storage policies in CAPV

Author: k8s-ci-robot

api/v1alpha3/types.go

@@ -100,6 +100,11 @@ type VirtualMachineCloneSpec struct {
 	// +optional
 	Datastore string `json:"datastore,omitempty"`
 
+	// StoragePolicyName of the storage policy to use with this
+	// Virtual Machine
+	// +optional
+	StoragePolicyName string `json:"storagePolicyName,omitempty"`
+
 	// ResourcePool is the name or inventory path of the resource pool in which
 	// the virtual machine is created/located.
 	// +optional

api/v1alpha3/vspheremachine_webhook.go

@@ -52,6 +52,10 @@ func (r *VSphereMachine) ValidateCreate() error {
 			}
 		}
 	}
+
+	if spec.Datastore != "" && spec.StoragePolicyName != "" {
+		allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "Datastore"), spec.Datastore, "cannot be set when spec.StoragePolicyName is also set"))
+	}
 	return aggregateObjErrors(r.GroupVersionKind().GroupKind(), r.Name, allErrs)
 }
 

api/v1alpha3/vspheremachinetemplate_webhook.go

@@ -53,6 +53,10 @@ func (r *VSphereMachineTemplate) ValidateCreate() error {
 			allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "template", "spec", "network", "devices", "ipAddrs"), "cannot be set in templates"))
 		}
 	}
+
+	if spec.Datastore != "" && spec.StoragePolicyName != "" {
+		allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "Datastore"), spec.Datastore, "cannot be set when spec.StoragePolicyName is also set"))
+	}
 	return aggregateObjErrors(r.GroupVersionKind().GroupKind(), r.Name, allErrs)
 }
 

api/v1alpha3/vspherevm_webhook.go

@@ -52,6 +52,10 @@ func (r *VSphereVM) ValidateCreate() error {
 			}
 		}
 	}
+
+	if spec.Datastore != "" && spec.StoragePolicyName != "" {
+		allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "Datastore"), spec.Datastore, "cannot be set when spec.StoragePolicyName is also set"))
+	}
 	return aggregateObjErrors(r.GroupVersionKind().GroupKind(), r.Name, allErrs)
 }
 

config/crd/bases/infrastructure.cluster.x-k8s.io_haproxyloadbalancers.yaml

@@ -250,6 +250,10 @@ spec:
                       create a linked clone. This field is ignored if LinkedClone
                       is not enabled. Defaults to the source's current snapshot.
                     type: string
+                  storagePolicyName:
+                    description: StoragePolicyName of the storage policy to use with
+                      this Virtual Machine
+                    type: string
                   template:
                     description: Template is the name or inventory path of the template
                       used to clone the virtual machine.

config/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachines.yaml

@@ -514,6 +514,10 @@ spec:
                   a linked clone. This field is ignored if LinkedClone is not enabled.
                   Defaults to the source's current snapshot.
                 type: string
+              storagePolicyName:
+                description: StoragePolicyName of the storage policy to use with this
+                  Virtual Machine
+                type: string
               template:
                 description: Template is the name or inventory path of the template
                   used to clone the virtual machine.

config/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachinetemplates.yaml

@@ -574,6 +574,10 @@ spec:
                           to create a linked clone. This field is ignored if LinkedClone
                           is not enabled. Defaults to the source's current snapshot.
                         type: string
+                      storagePolicyName:
+                        description: StoragePolicyName of the storage policy to use
+                          with this Virtual Machine
+                        type: string
                       template:
                         description: Template is the name or inventory path of the
                           template used to clone the virtual machine.

config/crd/bases/infrastructure.cluster.x-k8s.io_vspherevms.yaml

@@ -272,6 +272,10 @@ spec:
                   a linked clone. This field is ignored if LinkedClone is not enabled.
                   Defaults to the source's current snapshot.
                 type: string
+              storagePolicyName:
+                description: StoragePolicyName of the storage policy to use with this
+                  Virtual Machine
+                type: string
               template:
                 description: Template is the name or inventory path of the template
                   used to clone the virtual machine.

pkg/services/govmomi/vcenter/clone.go

@@ -19,6 +19,7 @@ package vcenter
 import (
 	"github.com/pkg/errors"
 	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/pbm"
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/types"
 
@@ -107,11 +108,6 @@ func Clone(ctx *context.VMContext, bootstrapData []byte) error {
 		return errors.Wrapf(err, "unable to get folder for %q", ctx)
 	}
 
-	datastore, err := ctx.Session.Finder.DatastoreOrDefault(ctx, ctx.VSphereVM.Spec.Datastore)
-	if err != nil {
-		return errors.Wrapf(err, "unable to get datastore for %q", ctx)
-	}
-
 	pool, err := ctx.Session.Finder.ResourcePoolOrDefault(ctx, ctx.VSphereVM.Spec.ResourcePool)
 	if err != nil {
 		return errors.Wrapf(err, "unable to get resource pool for %q", ctx)
@@ -167,7 +163,6 @@ func Clone(ctx *context.VMContext, bootstrapData []byte) error {
 			MemoryMB:          memMiB,
 		},
 		Location: types.VirtualMachineRelocateSpec{
-			Datastore:    types.NewReference(datastore.Reference()),
 			DiskMoveType: string(diskMoveType),
 			Folder:       types.NewReference(folder.Reference()),
 			Pool:         types.NewReference(pool.Reference()),
@@ -180,6 +175,27 @@ func Clone(ctx *context.VMContext, bootstrapData []byte) error {
 		Snapshot: snapshotRef,
 	}
 
+	if ctx.VSphereVM.Spec.StoragePolicyName != "" {
+		pbmClient, err := pbm.NewClient(ctx, ctx.Session.Client.Client)
+		if err != nil {
+			return errors.Wrapf(err, "unable to create pbm client for %q", ctx)
+		}
+
+		storageProfileID, err := pbmClient.ProfileIDByName(ctx, ctx.VSphereVM.Spec.StoragePolicyName)
+		if err != nil {
+			return errors.Wrapf(err, "unable to get storageProfileID from name %s for %q", ctx.VSphereVM.Spec.StoragePolicyName, ctx)
+		}
+		spec.Location.Profile = []types.BaseVirtualMachineProfileSpec{
+			&types.VirtualMachineDefinedProfileSpec{ProfileId: storageProfileID},
+		}
+	} else {
+		datastore, err := ctx.Session.Finder.DatastoreOrDefault(ctx, ctx.VSphereVM.Spec.Datastore)
+		if err != nil {
+			return errors.Wrapf(err, "unable to get datastore for %q", ctx)
+		}
+		spec.Location.Datastore = types.NewReference(datastore.Reference())
+	}
+
 	ctx.Logger.Info("cloning machine", "namespace", ctx.VSphereVM.Namespace, "name", ctx.VSphereVM.Name, "cloneType", ctx.VSphereVM.Status.CloneMode)
 	task, err := tpl.Clone(ctx, folder, ctx.VSphereVM.Name, spec)
 	if err != nil {