From 51c738b65bb4c13531182ed2ffcef96f78a6716c Mon Sep 17 00:00:00 2001 From: lidongshengxdayu Date: Wed, 3 Jul 2024 10:27:31 +0800 Subject: [PATCH] [occm] fix build issue with Upgrade Gophercloud to v2 --- pkg/openstack/loadbalancer.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/openstack/loadbalancer.go b/pkg/openstack/loadbalancer.go index 49f86edecc..942bd7864c 100644 --- a/pkg/openstack/loadbalancer.go +++ b/pkg/openstack/loadbalancer.go @@ -32,6 +32,7 @@ import ( "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/loadbalancers" v2monitors "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/monitors" v2pools "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/pools" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/attributestags" "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/layer3/floatingips" "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets" corev1 "k8s.io/api/core/v1" @@ -607,7 +608,7 @@ func (lbaas *LbaasV2) updateFloatingIPTag(floatingip *floatingips.FloatingIP, Ta if Tag == "" { return fmt.Errorf("Error input tag argument ") } - tags, err := attributestags.List(lbaas.network, "floatingips", floatingip.ID).Extract() + tags, err := attributestags.List(context.TODO(), lbaas.network, "floatingips", floatingip.ID).Extract() if err != nil { klog.V(3).Infof("Cannot get floatIP tags for floating %s", floatingip.ID) return err @@ -622,7 +623,7 @@ func (lbaas *LbaasV2) updateFloatingIPTag(floatingip *floatingips.FloatingIP, Ta if !found { return nil } - err = attributestags.Delete(lbaas.network, "floatingips", floatingip.ID, Tag).ExtractErr() + err = attributestags.Delete(context.TODO(), lbaas.network, "floatingips", floatingip.ID, Tag).ExtractErr() if err != nil { klog.V(3).Infof("Cannot update floatIP tag %s for floating %s", Tag, floatingip.ID) } @@ -630,7 +631,7 @@ func (lbaas *LbaasV2) updateFloatingIPTag(floatingip *floatingips.FloatingIP, Ta } if !found { - err = attributestags.Add(lbaas.network, "floatingips", floatingip.ID, Tag).ExtractErr() + err = attributestags.Add(context.TODO(), lbaas.network, "floatingips", floatingip.ID, Tag).ExtractErr() if err != nil { klog.V(3).Infof("Cannot update floatIP tag %s for floating %s", Tag, floatingip.ID) }