Fix: add nil check on Machine and Network Load Balancer (#349)

* add: subnet id nil check on network load balancer
oracle · Feb 8, 2024 · 8acfb46 · 8acfb46
1 parent 3e14e22
commit 8acfb46
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/cloud/scope/machine.go b/cloud/scope/machine.go
@@ -732,7 +732,9 @@ func (m *MachineScope) getGetControlPlaneMachineNSGs() []string {
 	nsgs := make([]string, 0)
 	for _, nsg := range m.OCIClusterAccessor.GetNetworkSpec().Vcn.NetworkSecurityGroup.List {
 		if nsg.Role == infrastructurev1beta2.ControlPlaneRole {
-			nsgs = append(nsgs, *nsg.ID)
+			if nsg.ID != nil {
+				nsgs = append(nsgs, *nsg.ID)
+			}
 		}
 	}
 	return nsgs
@@ -771,7 +773,9 @@ func (m *MachineScope) getWorkerMachineNSGs() []string {
 		for _, nsgName := range m.OCIMachine.Spec.NetworkDetails.NsgNames {
 			for _, nsg := range m.OCIClusterAccessor.GetNetworkSpec().Vcn.NetworkSecurityGroup.List {
 				if nsg.Name == nsgName {
-					nsgs = append(nsgs, *nsg.ID)
+					if nsg.ID != nil {
+						nsgs = append(nsgs, *nsg.ID)
+					}
 				}
 			}
 		}
@@ -780,7 +784,9 @@ func (m *MachineScope) getWorkerMachineNSGs() []string {
 		nsgs := make([]string, 0)
 		for _, nsg := range m.OCIClusterAccessor.GetNetworkSpec().Vcn.NetworkSecurityGroup.List {
 			if nsg.Role == infrastructurev1beta2.WorkerRole {
-				nsgs = append(nsgs, *nsg.ID)
+				if nsg.ID != nil {
+					nsgs = append(nsgs, *nsg.ID)
+				}
 			}
 		}
 		return nsgs

diff --git a/cloud/scope/network_load_balancer_reconciler.go b/cloud/scope/network_load_balancer_reconciler.go
@@ -165,7 +165,9 @@ func (s *ClusterScope) CreateNLB(ctx context.Context, lb infrastructurev1beta2.L
 	var controlPlaneEndpointSubnets []string
 	for _, subnet := range s.OCIClusterAccessor.GetNetworkSpec().Vcn.Subnets {
 		if subnet.Role == infrastructurev1beta2.ControlPlaneEndpointRole {
-			controlPlaneEndpointSubnets = append(controlPlaneEndpointSubnets, *subnet.ID)
+			if subnet.ID != nil {
+				controlPlaneEndpointSubnets = append(controlPlaneEndpointSubnets, *subnet.ID)
+			}
 		}
 	}
 	if len(controlPlaneEndpointSubnets) < 1 {