Fix test failures

Signed-off-by: Prajyot-Parab <[email protected]>

Author: Karthik-K-N

api/v1beta2/ibmpowervscluster_types.go

@@ -49,7 +49,6 @@ type IBMPowerVSClusterSpec struct {
 	// dhcpServer is contains the configuration to be used while creating a new DHCP server in PowerVS workspace.
 	// when the field is omitted, CLUSTER_NAME will be used as DHCPServer.Name and DHCP server will be created.
 	// it will automatically create network with name DHCPSERVER<DHCPServer.Name>_Private in PowerVS workspace.
-	// the default name
 	// +optional
 	DHCPServer *DHCPServer `json:"dhcpServer,omitempty"`
 

cloud/scope/powervs_machine.go

@@ -717,7 +717,7 @@ func (m *PowerVSMachineScope) SetHealth(health *models.PVMInstanceHealth) {
 }
 
 // SetAddresses will set the addresses for the machine.
-func (m *PowerVSMachineScope) SetAddresses(instance *models.PVMInstance) {
+func (m *PowerVSMachineScope) SetAddresses(instance *models.PVMInstance) { //nolint:gocyclo
 	var addresses []corev1.NodeAddress
 	// Setting the name of the vm to the InternalDNS and Hostname as the vm uses that as hostname.
 	addresses = append(addresses, corev1.NodeAddress{
@@ -910,7 +910,7 @@ func (m *PowerVSMachineScope) GetMachineInternalIP() string {
 }
 
 // CreateVPCLoadBalancerPoolMember creates a member in load balaner pool.
-func (m *PowerVSMachineScope) CreateVPCLoadBalancerPoolMember() (*vpcv1.LoadBalancerPoolMember, error) {
+func (m *PowerVSMachineScope) CreateVPCLoadBalancerPoolMember() (*vpcv1.LoadBalancerPoolMember, error) { //nolint:gocyclo
 	loadBalancers := make([]infrav1beta2.VPCLoadBalancerSpec, 0)
 	if len(m.IBMPowerVSCluster.Spec.LoadBalancers) == 0 {
 		loadBalancer := infrav1beta2.VPCLoadBalancerSpec{

config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsclusters.yaml

@@ -204,8 +204,7 @@ spec:
                   creating a new DHCP server in PowerVS workspace. when the field
                   is omitted, CLUSTER_NAME will be used as DHCPServer.Name and DHCP
                   server will be created. it will automatically create network with
-                  name DHCPSERVER<DHCPServer.Name>_Private in PowerVS workspace. the
-                  default name
+                  name DHCPSERVER<DHCPServer.Name>_Private in PowerVS workspace.
                 properties:
                   cidr:
                     description: Optional cidr for DHCP private network

config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsclustertemplates.yaml

@@ -231,7 +231,7 @@ spec:
                           when the field is omitted, CLUSTER_NAME will be used as
                           DHCPServer.Name and DHCP server will be created. it will
                           automatically create network with name DHCPSERVER<DHCPServer.Name>_Private
-                          in PowerVS workspace. the default name
+                          in PowerVS workspace.
                         properties:
                           cidr:
                             description: Optional cidr for DHCP private network

controllers/ibmpowervsmachine_controller.go

@@ -182,7 +182,10 @@ func (r *IBMPowerVSMachineReconciler) reconcileDelete(scope *scope.PowerVSMachin
 		scope.Info("error deleting IBMPowerVSMachine")
 		return ctrl.Result{}, fmt.Errorf("error deleting IBMPowerVSMachine %v: %w", klog.KObj(scope.IBMPowerVSMachine), err)
 	}
-
+	if err := scope.DeleteMachineIgnition(); err != nil {
+		scope.Info("error deleting IBMPowerVSMachine ignition")
+		return ctrl.Result{}, fmt.Errorf("error deleting IBMPowerVSMachine ignition %v: %w", klog.KObj(scope.IBMPowerVSMachine), err)
+	}
 	// Remove the cached VM IP
 	err := scope.DHCPIPCacheStore.Delete(powervs.VMip{Name: scope.IBMPowerVSMachine.Name})
 	if err != nil {