Merge pull request #287 from Liujingfang1/delete

catch up the change in PruneEvent during destroy

Author: k8s-ci-robot

cmd/printers/events/formatter.go

@@ -93,6 +93,8 @@ func (ef *formatter) FormatDeleteEvent(de event.DeleteEvent, ds *list.DeleteStat
 		case event.DeleteSkipped:
 			ef.print("%s %s", resourceIDToString(gvk.GroupKind(), name), "delete skipped")
 		}
+	case event.DeleteEventFailed:
+		ef.print("%s %s", resourceIDToString(de.Identifier.GroupKind, de.Identifier.Name), "deletion failed")
 	}
 	return nil
 }

pkg/apply/destroyer.go

@@ -124,6 +124,18 @@ func runPruneEventTransformer(eventChannel chan event.Event) (chan event.Event,
 	go func() {
 		defer close(completedChannel)
 		for msg := range tempEventChannel {
+			if msg.PruneEvent.Type == event.PruneEventFailed {
+				eventChannel <- event.Event{
+					Type: event.DeleteType,
+					DeleteEvent: event.DeleteEvent{
+						Type:       event.DeleteEventFailed,
+						Operation:  transformPruneOperation(msg.PruneEvent.Operation),
+						Object:     msg.PruneEvent.Object,
+						Identifier: msg.PruneEvent.Identifier,
+					},
+				}
+				continue
+			}
 			eventChannel <- event.Event{
 				Type: event.DeleteType,
 				DeleteEvent: event.DeleteEvent{