Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve IBMPowerVSCluster deletion #1825

Merged
merged 1 commit into from
Jun 21, 2024
Merged

Improve IBMPowerVSCluster deletion #1825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 17 additions & 26 deletions cloud/scope/powervs_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2285,12 +2285,12 @@ func (s *PowerVSClusterScope) DeleteLoadBalancer() (bool, error) {
continue
}

lb, _, err := s.IBMVPCClient.GetLoadBalancer(&vpcv1.GetLoadBalancerOptions{
lb, resp, err := s.IBMVPCClient.GetLoadBalancer(&vpcv1.GetLoadBalancerOptions{
ID: lb.ID,
})

if err != nil {
if strings.Contains(err.Error(), string(VPCLoadBalancerNotFound)) {
if resp != nil && resp.StatusCode == ResourceNotFoundCode {
s.Info("VPC load balancer successfully deleted")
continue
}
Expand Down Expand Up @@ -2324,10 +2324,10 @@ func (s *PowerVSClusterScope) DeleteVPCSecurityGroups() error {
s.Info("Skipping VPC security group deletion as resource is not created by controller", "ID", *securityGroup.ID)
continue
}
if _, _, err := s.IBMVPCClient.GetSecurityGroup(&vpcv1.GetSecurityGroupOptions{
if _, resp, err := s.IBMVPCClient.GetSecurityGroup(&vpcv1.GetSecurityGroupOptions{
ID: securityGroup.ID,
}); err != nil {
if strings.Contains(err.Error(), string(VPCSecurityGroupNotFound)) {
if resp != nil && resp.StatusCode == ResourceNotFoundCode {
s.Info("VPC security group has been already deleted", "ID", *securityGroup.ID)
continue
}
Expand Down Expand Up @@ -2356,12 +2356,12 @@ func (s *PowerVSClusterScope) DeleteVPCSubnet() (bool, error) {
continue
}

net, _, err := s.IBMVPCClient.GetSubnet(&vpcv1.GetSubnetOptions{
net, resp, err := s.IBMVPCClient.GetSubnet(&vpcv1.GetSubnetOptions{
ID: subnet.ID,
})

if err != nil {
if strings.Contains(err.Error(), string(VPCSubnetNotFound)) {
if resp != nil && resp.StatusCode == ResourceNotFoundCode {
s.Info("VPC subnet successfully deleted")
continue
}
Expand Down Expand Up @@ -2398,12 +2398,12 @@ func (s *PowerVSClusterScope) DeleteVPC() (bool, error) {
return false, nil
}

vpc, _, err := s.IBMVPCClient.GetVPC(&vpcv1.GetVPCOptions{
vpc, resp, err := s.IBMVPCClient.GetVPC(&vpcv1.GetVPCOptions{
ID: s.IBMPowerVSCluster.Status.VPC.ID,
})

if err != nil {
if strings.Contains(err.Error(), string(VPCNotFound)) {
if resp != nil && resp.StatusCode == ResourceNotFoundCode {
s.Info("VPC successfully deleted")
return false, nil
}
Expand Down Expand Up @@ -2433,12 +2433,12 @@ func (s *PowerVSClusterScope) DeleteTransitGateway() (bool, error) {
return false, nil
}

tg, _, err := s.TransitGatewayClient.GetTransitGateway(&tgapiv1.GetTransitGatewayOptions{
tg, resp, err := s.TransitGatewayClient.GetTransitGateway(&tgapiv1.GetTransitGatewayOptions{
ID: s.IBMPowerVSCluster.Status.TransitGateway.ID,
})

if err != nil {
if strings.Contains(err.Error(), string(TransitGatewayNotFound)) {
if resp != nil && resp.StatusCode == ResourceNotFoundCode {
s.Info("Transit gateway successfully deleted")
return false, nil
}
Expand Down Expand Up @@ -2498,6 +2498,10 @@ func (s *PowerVSClusterScope) DeleteDHCPServer() error {
s.Info("Skipping DHP server deletion as resource is not created by controller")
return nil
}
if s.isResourceCreatedByController(infrav1beta2.ResourceTypeServiceInstance) {
s.Info("Skipping DHCP server deletion as PowerVS service instance is created by controller, will directly delete the PowerVS service instance since it will delete the DHCP server internally")
return nil
}

if s.IBMPowerVSCluster.Status.DHCPServer.ID == nil {
return nil
Expand Down Expand Up @@ -2541,26 +2545,13 @@ func (s *PowerVSClusterScope) DeleteServiceInstance() (bool, error) {
return false, nil
}

// If PowerVS service instance is in failed state, proceed with deletion instead of checking for existing network resources.
if serviceInstance != nil && *serviceInstance.State != string(infrav1beta2.ServiceInstanceStateFailed) {
servers, err := s.IBMPowerVSClient.GetAllDHCPServers()
if err != nil {
return false, fmt.Errorf("error fetching networks in the PowerVS service instance: %w", err)
}

if len(servers) > 0 {
s.Info("Wait for DHCP server to be deleted before deleting PowerVS service instance")
return true, nil
}
}

if _, err = s.ResourceClient.DeleteResourceInstance(&resourcecontrollerv2.DeleteResourceInstanceOptions{
ID: serviceInstance.ID,
}); err != nil {
s.Error(err, "failed to delete Power VS service instance")
return false, err
}
s.Info("PowerVS service instance successfully deleted")

return true, nil
}

Expand All @@ -2575,11 +2566,11 @@ func (s *PowerVSClusterScope) DeleteCOSInstance() error {
return nil
}

cosInstance, _, err := s.ResourceClient.GetResourceInstance(&resourcecontrollerv2.GetResourceInstanceOptions{
cosInstance, resp, err := s.ResourceClient.GetResourceInstance(&resourcecontrollerv2.GetResourceInstanceOptions{
ID: s.IBMPowerVSCluster.Status.COSInstance.ID,
})
if err != nil {
if strings.Contains(err.Error(), string(COSInstanceNotFound)) {
if resp != nil && resp.StatusCode == ResourceNotFoundCode {
return nil
}
return fmt.Errorf("failed to fetch COS service instance: %w", err)
Expand Down
19 changes: 2 additions & 17 deletions cloud/scope/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,9 @@ package scope
type ResourceNotFound string

var (
// VPCLoadBalancerNotFound is the error returned when a VPC load balancer is not found.
VPCLoadBalancerNotFound = ResourceNotFound("cannot be found")

// VPCSubnetNotFound is the error returned when a VPC subnet is not found.
VPCSubnetNotFound = ResourceNotFound("Subnet not found")

// VPCNotFound is the error returned when a VPC is not found.
VPCNotFound = ResourceNotFound("VPC not found")

// TransitGatewayNotFound is the error returned when a transit gateway is not found.
TransitGatewayNotFound = ResourceNotFound("gateway was not found")
// ResourceNotFoundCode indicates the http status code when a resource does not exist.
ResourceNotFoundCode = 404

// DHCPServerNotFound is the error returned when a DHCP server is not found.
DHCPServerNotFound = ResourceNotFound("dhcp server does not exist")

// COSInstanceNotFound is the error returned when a COS service instance is not found.
COSInstanceNotFound = ResourceNotFound("COS instance unavailable")

// VPCSecurityGroupNotFound is the error returned when a VPC security group is not found.
VPCSecurityGroupNotFound = ResourceNotFound("Security group not found")
)