diff -up legacy-cloud-providers-kubernetes-1.22.0/openstack/openstack_loadbalancer.go.orig legacy-cloud-providers-kubernetes-1.22.0/openstack/openstack_loadbalancer.go --- legacy-cloud-providers-kubernetes-1.22.0/openstack/openstack_loadbalancer.go.orig 2021-08-04 22:54:45.000000000 +0200 +++ legacy-cloud-providers-kubernetes-1.22.0/openstack/openstack_loadbalancer.go 2021-09-04 00:09:46.496343581 +0200 @@ -39,6 +39,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/networking/v2/networks" neutronports "github.com/gophercloud/gophercloud/openstack/networking/v2/ports" "github.com/gophercloud/gophercloud/pagination" + utils "github.com/gophercloud/utils/openstack/networking/v2/extensions/security/groups" "k8s.io/klog/v2" v1 "k8s.io/api/core/v1" @@ -585,7 +586,7 @@ func getNodeSecurityGroupIDForLB(compute secGroupIDs := make([]string, secGroupNames.Len()) for i, name := range secGroupNames.List() { - secGroupID, err := groups.IDFromName(network, name) + secGroupID, err := utils.IDFromName(network, name) if err != nil { return []string{}, err } @@ -1033,7 +1034,7 @@ func (lbaas *LbaasV2) ensureSecurityGrou // ensure security group for LB lbSecGroupName := getSecurityGroupName(apiService) - lbSecGroupID, err := groups.IDFromName(lbaas.network, lbSecGroupName) + lbSecGroupID, err := utils.IDFromName(lbaas.network, lbSecGroupName) if err != nil { // If the security group of LB not exist, create it later if isSecurityGroupNotFound(err) { @@ -1338,7 +1339,7 @@ func (lbaas *LbaasV2) updateSecurityGrou // Generate Name lbSecGroupName := getSecurityGroupName(apiService) - lbSecGroupID, err := groups.IDFromName(lbaas.network, lbSecGroupName) + lbSecGroupID, err := utils.IDFromName(lbaas.network, lbSecGroupName) if err != nil { return fmt.Errorf("error occurred finding security group: %s: %v", lbSecGroupName, err) } @@ -1530,7 +1531,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancer func (lbaas *LbaasV2) EnsureSecurityGroupDeleted(clusterName string, service *v1.Service) error { // Generate Name lbSecGroupName := getSecurityGroupName(service) - lbSecGroupID, err := groups.IDFromName(lbaas.network, lbSecGroupName) + lbSecGroupID, err := utils.IDFromName(lbaas.network, lbSecGroupName) if err != nil { if isSecurityGroupNotFound(err) { // It is OK when the security group has been deleted by others.