@@ -419,26 +419,10 @@ public final <T extends HasMetadata> void deleteResource(boolean async, T... res
419
419
try {
420
420
if (type == null ) {
421
421
client .getClient ().resource (resource ).delete ();
422
- CompletableFuture <Void > c = CompletableFuture .runAsync (() ->
423
- assertTrue (waitResourceCondition (resource , ResourceCondition .deletion ()),
424
- String .format ("Timed out deleting %s/%s in %s" , resource .getKind (),
425
- resource .getMetadata ().getName (), resource .getMetadata ().getNamespace ())));
426
- if (async ) {
427
- waitExecutors .add (c );
428
- } else {
429
- CompletableFuture .allOf (c ).join ();
430
- }
422
+ decideDeleteWaitAsync (waitExecutors , async , resource );
431
423
} else {
432
424
type .delete (resource );
433
- CompletableFuture <Void > c = CompletableFuture .runAsync (() ->
434
- assertTrue (waitResourceCondition (resource , ResourceCondition .deletion ()),
435
- String .format ("Timed out deleting %s/%s in %s" , resource .getKind (),
436
- resource .getMetadata ().getName (), resource .getMetadata ().getNamespace ())));
437
- if (async ) {
438
- waitExecutors .add (c );
439
- } else {
440
- CompletableFuture .allOf (c ).join ();
441
- }
425
+ decideDeleteWaitAsync (waitExecutors , async , resource );
442
426
}
443
427
} catch (Exception e ) {
444
428
if (resource .getMetadata ().getNamespace () == null ) {
@@ -621,4 +605,17 @@ private void writeResourceAsYaml(HasMetadata resource) {
621
605
throw new RuntimeException (e );
622
606
}
623
607
}
608
+
609
+ private <T extends HasMetadata > void decideDeleteWaitAsync (List <CompletableFuture <Void >> waitExecutors ,
610
+ boolean async , T resource ) {
611
+ CompletableFuture <Void > c = CompletableFuture .runAsync (() ->
612
+ assertTrue (waitResourceCondition (resource , ResourceCondition .deletion ()),
613
+ String .format ("Timed out deleting %s/%s in %s" , resource .getKind (),
614
+ resource .getMetadata ().getName (), resource .getMetadata ().getNamespace ())));
615
+ if (async ) {
616
+ waitExecutors .add (c );
617
+ } else {
618
+ CompletableFuture .allOf (c ).join ();
619
+ }
620
+ }
624
621
}
0 commit comments