Fix for owls-85429 in operator 3.0.3 release (#2073)

ankedia · web-flow · commit d3465712a7ab · 2020-11-24T13:48:02.000-05:00
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java
@@ -898,7 +898,8 @@ public NextAction onFailure(Packet packet, CallResponse<Object> callResponses) {
 
     @Override
     public NextAction onSuccess(Packet packet, CallResponse<Object> callResponses) {
-      return doNext(replacePod(getNext()), packet);
+      PodAwaiterStepFactory pw = packet.getSpi(PodAwaiterStepFactory.class);
+      return doNext(pw.waitForDelete(pod, replacePod(getNext())), packet);
     }
   }
 
@@ -920,6 +921,7 @@ public NextAction onSuccess(Packet packet, CallResponse<V1Pod> callResponse) {
       PodAwaiterStepFactory pw = packet.getSpi(PodAwaiterStepFactory.class);
       return doNext(pw.waitForReady(newPod, getNext()), packet);
     }
+
   }
 
   private class PatchPodResponseStep extends BaseResponseStep {

Original file line number	Diff line number	Diff line change
`@@ -898,7 +898,8 @@ public NextAction onFailure(Packet packet, CallResponse<Object> callResponses) {`
`898`	`898`
`899`	`899`	`@Override`
`900`	`900`	`public NextAction onSuccess(Packet packet, CallResponse<Object> callResponses) {`
`901`		`- return doNext(replacePod(getNext()), packet);`
	`901`	`+ PodAwaiterStepFactory pw = packet.getSpi(PodAwaiterStepFactory.class);`
	`902`	`+ return doNext(pw.waitForDelete(pod, replacePod(getNext())), packet);`
`902`	`903`	`}`
`903`	`904`	`}`
`904`	`905`
`@@ -920,6 +921,7 @@ public NextAction onSuccess(Packet packet, CallResponse<V1Pod> callResponse) {`
`920`	`921`	`PodAwaiterStepFactory pw = packet.getSpi(PodAwaiterStepFactory.class);`
`921`	`922`	`return doNext(pw.waitForReady(newPod, getNext()), packet);`
`922`	`923`	`}`
	`924`	`+`
`923`	`925`	`}`
`924`	`926`
`925`	`927`	`private class PatchPodResponseStep extends BaseResponseStep {`