Merge pull request #1340 from giantswarm/fix_network_status_nilpointer_reconciliation

k8s-ci-robot · web-flow · commit 046d2e37ac3f · 2022-09-13T00:57:05.000-07:00
🐛 fix nilpointer during clusterctl move
diff --git a/pkg/cloud/services/loadbalancer/loadbalancer.go b/pkg/cloud/services/loadbalancer/loadbalancer.go
@@ -134,10 +134,13 @@ func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackClust
 		}
 
 		if allowedCIDRsSupported {
-			if err := s.getOrUpdateAllowedCIDRS(openStackCluster, listener); err != nil {
-				return err
+			// Skip reconciliation if network status is nil (e.g. during clusterctl move)
+			if openStackCluster.Status.Network != nil {
+				if err := s.getOrUpdateAllowedCIDRS(openStackCluster, listener); err != nil {
+					return err
+				}
+				allowedCIDRs = listener.AllowedCIDRs
 			}
-			allowedCIDRs = listener.AllowedCIDRs
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -134,10 +134,13 @@ func (s Service) ReconcileLoadBalancer(openStackCluster infrav1.OpenStackClust`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`if allowedCIDRsSupported {`
`137`		`- if err := s.getOrUpdateAllowedCIDRS(openStackCluster, listener); err != nil {`
`138`		`- return err`
	`137`	`+ // Skip reconciliation if network status is nil (e.g. during clusterctl move)`
	`138`	`+ if openStackCluster.Status.Network != nil {`
	`139`	`+ if err := s.getOrUpdateAllowedCIDRS(openStackCluster, listener); err != nil {`
	`140`	`+ return err`
	`141`	`+ }`
	`142`	`+ allowedCIDRs = listener.AllowedCIDRs`
`139`	`143`	`}`
`140`		`- allowedCIDRs = listener.AllowedCIDRs`
`141`	`144`	`}`
`142`	`145`	`}`
`143`	`146`