Add vSphere ResourcePool support (#726)

* Add vSphere resource pool support

Signed-off-by: Maximilian Lampert <[email protected]>

* Add resourcePool to docs

Signed-off-by: Maximilian Lampert <[email protected]>

* Remove VM template support

Signed-off-by: Maximilian Lampert <[email protected]>

* fix lint test

Signed-off-by: Maximilian Lampert <[email protected]>

Author: maxilampert

docs/vsphere.md

@@ -235,6 +235,10 @@ templateVMName: ubuntu-template
 vmNetName: network1
 # Optional
 folder: folder1
+# Optional: Force VMs to be provisoned to the specified resourcePool
+# Default is to use the resourcePool of the template VM
+# example: kubeone or /DC/host/Cluster01/Resources/kubeone
+resourcePool: kubeone
 cluster: cluster1
 # either datastore or datastoreCluster have to be provided.
 datastore: datastore1
@@ -251,7 +255,7 @@ diskSizeGB: 10
 
 ### Datastore and DatastoreCluster
 
-A `Datastore` is the basic unit of storage abstraction in VSphere storage (more details [here][datastore]).
+A `Datastore` is the basic unit of storage abstraction in vSphere storage (more details [here][datastore]).
 
 A `DatastoreCluster` (sometimes referred to as StoragePod) is a logical grouping of `Datastores`, it provides some resource management capabilities (more details [here][datastore_cluster]).
 

pkg/cloudprovider/provider/vsphere/helper.go

@@ -84,7 +84,13 @@ func createClonedVM(ctx context.Context, vmName string, config *Config, session
 		return nil, fmt.Errorf("failed to resolve datastore: %v", err)
 	}
 
+	resourcepoolref, err := resolveResourcePoolRef(ctx, config, session, tpl)
+	if err != nil {
+		return nil, fmt.Errorf("failed to resolve resourcePool: %v", err)
+	}
+
 	cloneSpec.Location.Datastore = datastoreref
+	cloneSpec.Location.Pool = resourcepoolref
 	// Create a cloned VM from the template VM's snapshot.
 	// We split the cloning from the reconfiguring as those actions differ on the permission side.
 	// It's nicer to tell which specific action failed due to lacking permissions.
@@ -427,3 +433,14 @@ func getDatastoreFromVM(ctx context.Context, session *Session, vmRef *object.Vir
 	}
 	return session.Finder.Datastore(ctx, datastorePathObj.Datastore)
 }
+
+func resolveResourcePoolRef(ctx context.Context, config *Config, session *Session, vm *object.VirtualMachine) (*types.ManagedObjectReference, error) {
+	if config.ResourcePool != "" {
+		targetResourcePool, err := session.Finder.ResourcePool(ctx, config.ResourcePool)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get target resourcepool: %v", err)
+		}
+		return types.NewReference(targetResourcePool.Reference()), nil
+	}
+	return nil, nil
+}

pkg/cloudprovider/provider/vsphere/provider.go

@@ -65,6 +65,7 @@ type Config struct {
 	Datacenter       string
 	Cluster          string
 	Folder           string
+	ResourcePool     string
 	Datastore        string
 	DatastoreCluster string
 	AllowInsecure    bool
@@ -164,6 +165,11 @@ func (p *provider) getConfig(s v1alpha1.ProviderSpec) (*Config, *providerconfigt
 		return nil, nil, nil, err
 	}
 
+	c.ResourcePool, err = p.configVarResolver.GetConfigVarStringValue(rawConfig.ResourcePool)
+	if err != nil {
+		return nil, nil, nil, err
+	}
+
 	c.Datastore, err = p.configVarResolver.GetConfigVarStringValue(rawConfig.Datastore)
 	if err != nil {
 		return nil, nil, nil, err
@@ -226,6 +232,12 @@ func (p *provider) Validate(spec v1alpha1.MachineSpec) error {
 		return fmt.Errorf("a vm %s/%s already exists", config.Folder, spec.Name)
 	}
 
+	if config.ResourcePool != "" {
+		if _, err := session.Finder.ResourcePool(ctx, config.ResourcePool); err != nil {
+			return fmt.Errorf("failed to get resourcepool %q: %v", config.ResourcePool, err)
+		}
+	}
+
 	templateVM, err := session.Finder.VirtualMachine(ctx, config.TemplateVMName)
 	if err != nil {
 		return fmt.Errorf("failed to get template vm %q: %v", config.TemplateVMName, err)

pkg/cloudprovider/provider/vsphere/provider_test.go

@@ -56,6 +56,7 @@ func (m machineSpecArgs) generateMachineSpec(user, password, url string) v1alpha
 						"datacenter": "DC0",
 						%s
 						"folder": "/",
+						"resourcePool": "/DC0/host/DC0_C0/Resources",
 						"memoryMB": 2000,
 						"password": "%s",
 						"templateVMName": "DC0_H0_VM0",

pkg/cloudprovider/provider/vsphere/types/types.go

@@ -30,6 +30,7 @@ type RawConfig struct {
 	Datacenter     providerconfigtypes.ConfigVarString `json:"datacenter"`
 	Cluster        providerconfigtypes.ConfigVarString `json:"cluster"`
 	Folder         providerconfigtypes.ConfigVarString `json:"folder"`
+	ResourcePool   providerconfigtypes.ConfigVarString `json:"resourcePool"`
 
 	// Either Datastore or DatastoreCluster have to be provided.
 	DatastoreCluster providerconfigtypes.ConfigVarString `json:"datastoreCluster"`