Merge pull request #681 from NetApp/machine-deletion

k8s-ci-robot · web-flow · commit 025bdc51fcc9 · 2019-12-06T09:42:50.000-08:00
restore machine deletion
diff --git a/controllers/vspheremachine_controller.go b/controllers/vspheremachine_controller.go
@@ -182,12 +182,12 @@ func (r machineReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result, reterr er
 		}
 	}()
 
-	// Handle deleted clusters
-	if !vsphereCluster.DeletionTimestamp.IsZero() {
+	// Handle deleted machines
+	if !vsphereMachine.ObjectMeta.DeletionTimestamp.IsZero() {
 		return r.reconcileDelete(machineContext)
 	}
 
-	// Handle non-deleted clusters
+	// Handle non-deleted machines
 	return r.reconcileNormal(machineContext)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -182,12 +182,12 @@ func (r machineReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result, reterr er`
`182`	`182`	`}`
`183`	`183`	`}()`
`184`	`184`
`185`		`- // Handle deleted clusters`
`186`		`- if !vsphereCluster.DeletionTimestamp.IsZero() {`
	`185`	`+ // Handle deleted machines`
	`186`	`+ if !vsphereMachine.ObjectMeta.DeletionTimestamp.IsZero() {`
`187`	`187`	`return r.reconcileDelete(machineContext)`
`188`	`188`	`}`
`189`	`189`
`190`		`- // Handle non-deleted clusters`
	`190`	`+ // Handle non-deleted machines`
`191`	`191`	`return r.reconcileNormal(machineContext)`
`192`	`192`	`}`
`193`	`193`