github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Changes in OpenStack cloud provider for latest gophercloud

Browse Source
This commit is contained in:
Davanum Srinivas 2017-09-01 18:18:27 -04:00
parent 73326ef01d
commit b6721bebea
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
View File

@ -994,7 +994,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
} }
portID := loadbalancer.VipPortID portID := loadbalancer.VipPortID
update_opts := neutronports.UpdateOpts{SecurityGroups: []string{lbSecGroup.ID}} update_opts := neutronports.UpdateOpts{SecurityGroups: &[]string{lbSecGroup.ID}}
res := neutronports.Update(lbaas.network, portID, update_opts) res := neutronports.Update(lbaas.network, portID, update_opts)
if res.Err != nil { if res.Err != nil {
glog.Errorf("Error occured updating port: %s", portID) glog.Errorf("Error occured updating port: %s", portID)

4
pkg/cloudprovider/providers/openstack/openstack_routes.go
View File

@ -121,7 +121,7 @@ func updateAllowedAddressPairs(network *gophercloud.ServiceClient, port *neutron
origPairs := port.AllowedAddressPairs // shallow copy origPairs := port.AllowedAddressPairs // shallow copy
_, err := neutronports.Update(network, port.ID, neutronports.UpdateOpts{ _, err := neutronports.Update(network, port.ID, neutronports.UpdateOpts{
AllowedAddressPairs: newPairs, AllowedAddressPairs: &newPairs,
}).Extract() }).Extract()
if err != nil { if err != nil {
return nil, err return nil, err
@ -130,7 +130,7 @@ func updateAllowedAddressPairs(network *gophercloud.ServiceClient, port *neutron
unwinder := func() { unwinder := func() {
glog.V(4).Info("Reverting allowed-address-pairs change to port ", port.ID) glog.V(4).Info("Reverting allowed-address-pairs change to port ", port.ID)
_, err := neutronports.Update(network, port.ID, neutronports.UpdateOpts{ _, err := neutronports.Update(network, port.ID, neutronports.UpdateOpts{
AllowedAddressPairs: origPairs, AllowedAddressPairs: &origPairs,
}).Extract() }).Extract()
if err != nil { if err != nil {
glog.Warning("Unable to reset allowed-address-pairs during error unwind: ", err) glog.Warning("Unable to reset allowed-address-pairs during error unwind: ", err)