github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

vsphere: adjust to govmomi tags API changes

Browse Source
This commit is contained in:
Doug MacEachern 2018-08-22 11:22:24 -07:00
parent 5816a8bc18
commit d4d5c1e7db
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/cloudprovider/providers/vsphere/vsphere.go
View File

@ -34,7 +34,7 @@ import (
"gopkg.in/gcfg.v1" "gopkg.in/gcfg.v1"
"github.com/golang/glog" "github.com/golang/glog"
_ "github.com/vmware/govmomi/vapi/rest" "github.com/vmware/govmomi/vapi/rest"
"github.com/vmware/govmomi/vapi/tags" "github.com/vmware/govmomi/vapi/tags"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
k8stypes "k8s.io/apimachinery/pkg/types" k8stypes "k8s.io/apimachinery/pkg/types"
@ -1319,11 +1319,10 @@ func (vs *VSphere) NodeManager() (nodeManager *NodeManager) {
return vs.nodeManager return vs.nodeManager
} }
func withTagsClient(ctx context.Context, connection *vclib.VSphereConnection, f func(c *tags.RestClient) error) error { func withTagsClient(ctx context.Context, connection *vclib.VSphereConnection, f func(c *rest.Client) error) error {
vsURL := connection.Client.URL() c := rest.NewClient(connection.Client)
vsURL.User = url.UserPassword(connection.Username, connection.Password) user := url.UserPassword(connection.Username, connection.Password)
c := tags.NewClient(vsURL, connection.Insecure, "") if err := c.Login(ctx, user); err != nil {
if err := c.Login(ctx); err != nil {
return err return err
} }
defer c.Logout(ctx) defer c.Logout(ctx)
@ -1354,7 +1353,8 @@ func (vs *VSphere) GetZone(ctx context.Context) (cloudprovider.Zone, error) {
return cloudprovider.Zone{}, err return cloudprovider.Zone{}, err
} }
client := vsi.conn client := vsi.conn
err = withTagsClient(ctx, client, func(client *tags.RestClient) error { err = withTagsClient(ctx, client, func(c *rest.Client) error {
client := tags.NewManager(c)
tags, err := client.ListAttachedTags(ctx, vmHost) tags, err := client.ListAttachedTags(ctx, vmHost)
if err != nil { if err != nil {
glog.Errorf("Cannot list attached tags. Get zone for node %s error", nodeName) glog.Errorf("Cannot list attached tags. Get zone for node %s error", nodeName)