Correct some issues with shutdown grace period

Author: rjeberhard

model/src/main/java/oracle/kubernetes/weblogic/domain/model/ServerPod.java

@@ -146,7 +146,7 @@ Shutdown getShutdown() {
     return this.shutdown;
   }
 
-  void setShutdown(String shutdownType, Integer timeoutSeconds, Boolean ignoreSessions) {
+  void setShutdown(String shutdownType, Long timeoutSeconds, Boolean ignoreSessions) {
     this.shutdown
         .shutdownType(shutdownType)
         .timeoutSeconds(timeoutSeconds)

model/src/main/java/oracle/kubernetes/weblogic/domain/model/Shutdown.java

@@ -16,7 +16,8 @@
 
 @Description("Shutdown describes the configuration for shutting down a server instance.")
 public class Shutdown {
-  public static final Integer DEFAULT_TIMEOUT = 30;
+  // Default timeout must stay 30 seconds to match Kubernetes default
+  public static final Long DEFAULT_TIMEOUT = 30l;
   public static final Boolean DEFAULT_IGNORESESSIONS = Boolean.FALSE;
 
   @Description(
@@ -27,7 +28,7 @@ public class Shutdown {
 
   @Description(
       "For graceful shutdown only, number of seconds to wait before aborting in-flight work and shutting down the server. Not required. Defaults to 30 seconds.")
-  private Integer timeoutSeconds;
+  private Long timeoutSeconds;
 
   @Description(
       "For graceful shutdown only, indicates to ignore pending HTTP sessions during in-flight work handling. Not required. Defaults to false.")
@@ -56,11 +57,11 @@ public Shutdown shutdownType(String shutdownType) {
     return this;
   }
 
-  public Integer getTimeoutSeconds() {
+  public Long getTimeoutSeconds() {
     return Optional.ofNullable(timeoutSeconds).orElse(DEFAULT_TIMEOUT);
   }
 
-  public Shutdown timeoutSeconds(Integer timeoutSeconds) {
+  public Shutdown timeoutSeconds(Long timeoutSeconds) {
     this.timeoutSeconds = timeoutSeconds;
     return this;
   }

model/src/test/java/oracle/kubernetes/weblogic/domain/model/DomainV2Test.java

@@ -1109,7 +1109,7 @@ public void whenDomain2ReadFromYaml_ShutdownIsReadFromSpec() throws IOException
 
     Shutdown shutdown = domain.getSpec().getShutdown();
     assertThat(shutdown.getShutdownType(), is("Graceful"));
-    assertThat(shutdown.getTimeoutSeconds(), is(45));
+    assertThat(shutdown.getTimeoutSeconds(), is(45l));
   }
 
   @Test
@@ -1118,7 +1118,7 @@ public void whenDomain2ReadFromYaml_ShutdownIsReadFromClusterSpec() throws IOExc
 
     Shutdown shutdown = domain.getCluster("cluster2").getShutdown();
     assertThat(shutdown.getShutdownType(), is("Graceful"));
-    assertThat(shutdown.getTimeoutSeconds(), is(45));
+    assertThat(shutdown.getTimeoutSeconds(), is(45l));
     assertThat(shutdown.getIgnoreSessions(), is(true));
   }
 
@@ -1128,7 +1128,7 @@ public void whenDomain2ReadFromYaml_ShutdownIsReadFromServerSpec() throws IOExce
 
     Shutdown shutdown = domain.getServer("server2", "cluster2").getShutdown();
     assertThat(shutdown.getShutdownType(), is("Graceful"));
-    assertThat(shutdown.getTimeoutSeconds(), is(60));
+    assertThat(shutdown.getTimeoutSeconds(), is(60l));
     assertThat(shutdown.getIgnoreSessions(), is(false));
   }
 

operator/src/main/java/oracle/kubernetes/operator/helpers/PodHelper.java

@@ -37,7 +37,7 @@
 public class PodHelper {
   private static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
 
-  private static final int DEFAULT_ADDITIONAL_DELETE_TIME = 10;
+  static final long DEFAULT_ADDITIONAL_DELETE_TIME = 10;
 
   private PodHelper() {}
 

operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java

@@ -587,18 +587,19 @@ V1Pod withNonHashedElements(V1Pod pod) {
         .filter(PodStepContext::isCustomerItem)
         .forEach(e -> metadata.putAnnotationsItem(e.getKey(), e.getValue()));
 
-    insertShutdownEnvironmentVariables(pod);
+    updateForShutdown(pod);
     return pod;
   }
 
   /**
-   * Inserts into the pod the environment variables related to shutdown behavior.
+   * Inserts into the pod the environment variables and other configuration related to shutdown
+   * behavior.
    *
    * @param pod The pod
    */
-  final void insertShutdownEnvironmentVariables(V1Pod pod) {
+  final void updateForShutdown(V1Pod pod) {
     String shutdownType = GRACEFUL_SHUTDOWNTYPE;
-    int timeout = Shutdown.DEFAULT_TIMEOUT;
+    Long timeout = Shutdown.DEFAULT_TIMEOUT;
     boolean ignoreSessions = Shutdown.DEFAULT_IGNORESESSIONS;
     String serverName = null;
     String clusterName = null;
@@ -633,6 +634,8 @@ final void insertShutdownEnvironmentVariables(V1Pod pod) {
         break;
       }
     }
+
+    pod.getSpec().terminationGracePeriodSeconds(timeout + PodHelper.DEFAULT_ADDITIONAL_DELETE_TIME);
   }
 
   private static boolean isCustomerItem(Map.Entry<String, String> entry) {