verify the ID is present in Status before returning it to avoid nil p…

…ointer issue
kubernetes-sigs · Apr 19, 2024 · bb3d955 · bb3d955
1 parent 910b331
commit bb3d955
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/cloud/scope/powervs_cluster.go b/cloud/scope/powervs_cluster.go
@@ -399,7 +399,7 @@ func (s *PowerVSClusterScope) GetDHCPServerID() *string {
 	if s.IBMPowerVSCluster.Spec.DHCPServer != nil && s.IBMPowerVSCluster.Spec.DHCPServer.ID != nil {
 		return s.IBMPowerVSCluster.Spec.DHCPServer.ID
 	}
-	if s.IBMPowerVSCluster.Status.DHCPServer != nil {
+	if s.IBMPowerVSCluster.Status.DHCPServer != nil && s.IBMPowerVSCluster.Status.DHCPServer.ID != nil {
 		return s.IBMPowerVSCluster.Status.DHCPServer.ID
 	}
 	return nil
@@ -420,7 +420,7 @@ func (s *PowerVSClusterScope) GetVPCID() *string {
 	if s.IBMPowerVSCluster.Spec.VPC != nil && s.IBMPowerVSCluster.Spec.VPC.ID != nil {
 		return s.IBMPowerVSCluster.Spec.VPC.ID
 	}
-	if s.IBMPowerVSCluster.Status.VPC != nil {
+	if s.IBMPowerVSCluster.Status.VPC != nil && s.IBMPowerVSCluster.Status.VPC.ID != nil {
 		return s.IBMPowerVSCluster.Status.VPC.ID
 	}
 	return nil
@@ -482,7 +482,7 @@ func (s *PowerVSClusterScope) GetTransitGatewayID() *string {
 	if s.IBMPowerVSCluster.Spec.TransitGateway != nil && s.IBMPowerVSCluster.Spec.TransitGateway.ID != nil {
 		return s.IBMPowerVSCluster.Spec.TransitGateway.ID
 	}
-	if s.IBMPowerVSCluster.Status.TransitGateway != nil {
+	if s.IBMPowerVSCluster.Status.TransitGateway != nil && s.IBMPowerVSCluster.Status.TransitGateway.ID != nil {
 		return s.IBMPowerVSCluster.Status.TransitGateway.ID
 	}
 	return nil