Merge pull request #1231 from stackhpc/fix/delete-bastion-nil-pointer

k8s-ci-robot · web-flow · commit b59feea97966 · 2022-05-03T00:47:57.000-07:00
🐛 Fix nil pointer reference during bastion deletion
diff --git a/controllers/openstackcluster_controller.go b/controllers/openstackcluster_controller.go
@@ -221,12 +221,12 @@ func deleteBastion(scope *scope.Scope, cluster *clusterv1.Cluster, openStackClus
 				}
 			}
 		}
-	}
 
-	instanceSpec := bastionToInstanceSpec(openStackCluster, cluster.Name)
-	if err = computeService.DeleteInstance(openStackCluster, instanceSpec, instanceStatus); err != nil {
-		handleUpdateOSCError(openStackCluster, errors.Errorf("failed to delete bastion: %v", err))
-		return errors.Errorf("failed to delete bastion: %v", err)
+		instanceSpec := bastionToInstanceSpec(openStackCluster, cluster.Name)
+		if err = computeService.DeleteInstance(openStackCluster, instanceSpec, instanceStatus); err != nil {
+			handleUpdateOSCError(openStackCluster, errors.Errorf("failed to delete bastion: %v", err))
+			return errors.Errorf("failed to delete bastion: %v", err)
+		}
 	}
 
 	openStackCluster.Status.Bastion = nil

Original file line number	Diff line number	Diff line change
`@@ -221,12 +221,12 @@ func deleteBastion(scope scope.Scope, cluster clusterv1.Cluster, openStackClus`
`221`	`221`	`}`
`222`	`222`	`}`
`223`	`223`	`}`
`224`		`- }`
`225`	`224`
`226`		`- instanceSpec := bastionToInstanceSpec(openStackCluster, cluster.Name)`
`227`		`- if err = computeService.DeleteInstance(openStackCluster, instanceSpec, instanceStatus); err != nil {`
`228`		`- handleUpdateOSCError(openStackCluster, errors.Errorf("failed to delete bastion: %v", err))`
`229`		`- return errors.Errorf("failed to delete bastion: %v", err)`
	`225`	`+ instanceSpec := bastionToInstanceSpec(openStackCluster, cluster.Name)`
	`226`	`+ if err = computeService.DeleteInstance(openStackCluster, instanceSpec, instanceStatus); err != nil {`
	`227`	`+ handleUpdateOSCError(openStackCluster, errors.Errorf("failed to delete bastion: %v", err))`
	`228`	`+ return errors.Errorf("failed to delete bastion: %v", err)`
	`229`	`+ }`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`openStackCluster.Status.Bastion = nil`