Merge pull request #610 from oracle/delete-processing

Register on domain up and down

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/DomainProcessorImpl.java

@@ -687,6 +687,7 @@ public StartPlanStep(DomainPresenceInfo info, Step next) {
 
     @Override
     public NextAction apply(Packet packet) {
+      registerDomainPresenceInfo(info);
       Step strategy = getNext();
       if (!info.isPopulated()) {
         strategy = Step.chain(readExistingPods(info), readExistingServices(info), strategy);
@@ -695,21 +696,6 @@ public NextAction apply(Packet packet) {
     }
   }
 
-  private static class RegisterStep extends Step {
-    private final DomainPresenceInfo info;
-
-    public RegisterStep(DomainPresenceInfo info, Step next) {
-      super(next);
-      this.info = info;
-    }
-
-    @Override
-    public NextAction apply(Packet packet) {
-      registerDomainPresenceInfo(info);
-      return doNext(packet);
-    }
-  }
-
   private static class UnregisterStep extends Step {
     private final DomainPresenceInfo info;
 
@@ -896,7 +882,7 @@ static Step createDomainUpPlan(DomainPresenceInfo info) {
     return Step.chain(
         new UpHeadStep(info),
         ConfigMapHelper.readExistingSituConfigMap(info.getNamespace(), info.getDomainUID()),
-        new RegisterStep(info, strategy));
+        strategy);
   }
 
   static Step createDomainDownPlan(DomainPresenceInfo info) {

operator/src/main/java/oracle/kubernetes/operator/PodWatcher.java

@@ -111,7 +111,8 @@ public void receivedResponse(Watch.Response<V1Pod> item) {
   }
 
   static boolean isTerminating(V1Pod pod) {
-    return pod.getMetadata().getDeletionTimestamp() != null;
+    return pod.getMetadata().getDeletionTimestamp() != null
+        || pod.getMetadata().getDeletionGracePeriodSeconds() != null;
   }
 
   static boolean isReady(V1Pod pod) {