Remove DHCP server deletion

Author: dharaneeshvrd

cloud/scope/powervs_cluster.go

@@ -20,11 +20,9 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"reflect"
-	"strings"
-
 	"github.com/go-logr/logr"
 	regionUtil "github.com/ppc64le-cloud/powervs-utils"
+	"reflect"
 
 	"github.com/IBM-Cloud/power-go-client/ibmpisession"
 	"github.com/IBM-Cloud/power-go-client/power/models"
@@ -2492,32 +2490,6 @@ func (s *PowerVSClusterScope) deleteTransitGatewayConnections(tg *tgapiv1.Transi
 	return requeue, nil
 }
 
-// DeleteDHCPServer deletes DHCP server.
-func (s *PowerVSClusterScope) DeleteDHCPServer() error {
-	if !s.isResourceCreatedByController(infrav1beta2.ResourceTypeDHCPServer) {
-		s.Info("Skipping DHP server deletion as resource is not created by controller")
-		return nil
-	}
-
-	if s.IBMPowerVSCluster.Status.DHCPServer.ID == nil {
-		return nil
-	}
-
-	server, err := s.IBMPowerVSClient.GetDHCPServer(*s.IBMPowerVSCluster.Status.DHCPServer.ID)
-	if err != nil {
-		if strings.Contains(err.Error(), string(DHCPServerNotFound)) {
-			s.Info("DHCP server successfully deleted")
-			return nil
-		}
-		return fmt.Errorf("failed to fetch DHCP server: %w", err)
-	}
-
-	if err = s.IBMPowerVSClient.DeleteDHCPServer(*server.ID); err != nil {
-		return fmt.Errorf("failed to delete DHCP server: %w", err)
-	}
-	return nil
-}
-
 // DeleteServiceInstance deletes service instance.
 func (s *PowerVSClusterScope) DeleteServiceInstance() (bool, error) {
 	if !s.isResourceCreatedByController(infrav1beta2.ResourceTypeServiceInstance) {

controllers/ibmpowervscluster_controller.go

@@ -308,11 +308,6 @@ func (r *IBMPowerVSClusterReconciler) reconcileDelete(ctx context.Context, clust
 		return reconcile.Result{RequeueAfter: 15 * time.Second}, nil
 	}
 
-	clusterScope.Info("Deleting DHCP server")
-	if err := clusterScope.DeleteDHCPServer(); err != nil {
-		clusterScope.Error(err, "failed to delete DHCP server, attempting to delete Power VS service instance!")
-	}
-
 	clusterScope.Info("Deleting Power VS service instance")
 	if requeue, err := clusterScope.DeleteServiceInstance(); err != nil {
 		allErrs = append(allErrs, errors.Wrapf(err, "failed to delete Power VS service instance"))

pkg/cloud/services/powervs/powervs.go

@@ -41,7 +41,6 @@ type PowerVS interface {
 	GetAllDHCPServers() (models.DHCPServers, error)
 	GetDHCPServer(id string) (*models.DHCPServerDetail, error)
 	CreateDHCPServer(*models.DHCPServerCreate) (*models.DHCPServer, error)
-	DeleteDHCPServer(id string) error
 	WithClients(options ServiceOptions) *Service
 	GetNetworkByName(networkName string) (*models.NetworkReference, error)
 	GetDatacenterCapabilities(zone string) (map[string]bool, error)

pkg/cloud/services/powervs/service.go

@@ -167,11 +167,6 @@ func (s *Service) CreateDHCPServer(options *models.DHCPServerCreate) (*models.DH
 	return s.dhcpClient.Create(options)
 }
 
-// DeleteDHCPServer deletes the DHCP server.
-func (s *Service) DeleteDHCPServer(id string) error {
-	return s.dhcpClient.Delete(id)
-}
-
 // GetNetworkByName fetches the network with name. If not found, returns nil.
 func (s *Service) GetNetworkByName(networkName string) (*models.NetworkReference, error) {
 	var network *models.NetworkReference