Merge pull request #1880 from shiftstack/cluster-network-cleanup

k8s-ci-robot · web-flow · commit 88dcecf4103c · 2024-02-15T08:54:53.000-08:00
🐛 Fix cluster network cleanup
diff --git a/controllers/openstackcluster_controller.go b/controllers/openstackcluster_controller.go
@@ -184,7 +184,7 @@ func (r *OpenStackClusterReconciler) reconcileDelete(ctx context.Context, scope
 	}
 
 	// if ManagedSubnets was not set, no network was created.
-	if len(openStackCluster.Spec.ManagedSubnets) == 0 {
+	if len(openStackCluster.Spec.ManagedSubnets) > 0 {
 		if err = networkingService.DeleteRouter(openStackCluster, clusterName); err != nil {
 			handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to delete router: %w", err))
 			return ctrl.Result{}, fmt.Errorf("failed to delete router: %w", err)

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ func (r *OpenStackClusterReconciler) reconcileDelete(ctx context.Context, scope`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`// if ManagedSubnets was not set, no network was created.`
`187`		`- if len(openStackCluster.Spec.ManagedSubnets) == 0 {`
	`187`	`+ if len(openStackCluster.Spec.ManagedSubnets) > 0 {`
`188`	`188`	`if err = networkingService.DeleteRouter(openStackCluster, clusterName); err != nil {`
`189`	`189`	`handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to delete router: %w", err))`
`190`	`190`	`return ctrl.Result{}, fmt.Errorf("failed to delete router: %w", err)`