Skip to content

Commit

Permalink
delete port left over by err openstackmachine
Browse files Browse the repository at this point in the history
  • Loading branch information
ruifaling committed Jun 22, 2022
1 parent 83fe948 commit 6a8ed3e
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 0 deletions.
5 changes: 5 additions & 0 deletions controllers/openstackcluster_controller.go
Expand Up @@ -142,6 +142,11 @@ func reconcileDelete(ctx context.Context, scope *scope.Scope, patchHelper *patch

clusterName := fmt.Sprintf("%s-%s", cluster.Namespace, cluster.Name)

if err = networkingService.DeletePorts(openStackCluster); err != nil {
handleUpdateOSCError(openStackCluster, errors.Errorf("failed to delete ports: %v", err))
return reconcile.Result{}, errors.Wrap(err, "failed to delete ports")
}

if openStackCluster.Spec.APIServerLoadBalancer.Enabled {
loadBalancerService, err := loadbalancer.NewService(scope)
if err != nil {
Expand Down
27 changes: 27 additions & 0 deletions pkg/cloud/services/networking/port.go
Expand Up @@ -18,6 +18,7 @@ package networking

import (
"fmt"
"strings"
"time"

"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/portsbinding"
Expand Down Expand Up @@ -243,6 +244,32 @@ func (s *Service) DeletePort(eventObject runtime.Object, portID string) error {
return nil
}

func (s *Service) DeletePorts(openStackCluster *infrav1.OpenStackCluster) error {
networkID := openStackCluster.Spec.Network.ID
portList, err := s.client.ListPort(ports.ListOpts{
NetworkID: networkID,
DeviceOwner: "",
})
if err != nil {
if capoerrors.IsNotFound(err) {
return nil
}
return fmt.Errorf("list ports of network %q: %v", networkID, err)
}

for _, port := range portList {
if strings.Contains(port.Name, openStackCluster.Name) {
err := s.DeletePort(openStackCluster, port.ID)
if capoerrors.IsNotFound(err) {
continue
}
return fmt.Errorf("delete port %s of network %q failed : %v", port.ID, networkID, err)
}
}

return nil
}

func (s *Service) GarbageCollectErrorInstancesPort(eventObject runtime.Object, instanceName string) error {
portList, err := s.client.ListPort(ports.ListOpts{
Name: instanceName,
Expand Down

0 comments on commit 6a8ed3e

Please sign in to comment.