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