Skip to content

K
k3s
Unverified Commit cd6a03fe authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #66317 from vmware/automated-cherry-pick-of-#66261-upstream-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #66261 to upstream release-1.10 Cherry pick of #66261 on release-1.10 #66261: Fix locating resourcepool-path specified in the vsphere.conf file Release note: ``` Fix locating resourcepool-path specified in the vsphere.conf file ``` cc: @kubernetes/vmware
parents 11dd73f9 a140af11
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 9 deletions
pkg/cloudprovider/providers/vsphere/vclib/datacenter.go
View file @ cd6a03fe
...@@ -155,20 +155,16 @@ func (dc *Datacenter) GetDatastoreByName(ctx context.Context, name string) (*Dat ...@@ -155,20 +155,16 @@ func (dc *Datacenter) GetDatastoreByName(ctx context.Context, name string) (*Dat
} }
// GetResourcePool gets the resource pool for the given path // GetResourcePool gets the resource pool for the given path
func (dc *Datacenter) GetResourcePool(ctx context.Context, computePath string) (*object.ResourcePool, error) { func (dc *Datacenter) GetResourcePool(ctx context.Context, resourcePoolPath string) (*object.ResourcePool, error) {
finder := getFinder(dc) finder := getFinder(dc)
var computeResource *object.ComputeResource var resourcePool *object.ResourcePool
var err error var err error
if computePath == "" { resourcePool, err = finder.ResourcePoolOrDefault(ctx, resourcePoolPath)
computeResource, err = finder.DefaultComputeResource(ctx)
} else {
computeResource, err = finder.ComputeResource(ctx, computePath)
}
if err != nil { if err != nil {
glog.Errorf("Failed to get the ResourcePool for computePath '%s'. err: %+v", computePath, err) glog.Errorf("Failed to get the ResourcePool for path '%s'. err: %+v", resourcePoolPath, err)
return nil, err return nil, err
} }
return computeResource.ResourcePool(ctx) return resourcePool, nil
} }
// GetFolderByPath gets the Folder Object from the given folder path // GetFolderByPath gets the Folder Object from the given folder path
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment