Merge remote-tracking branch 'origin/pod_helper_logging-rc1' into develop

Author: rjeberhard

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

@@ -99,7 +99,7 @@ protected boolean isDomainHomeInImage() {
   }
 
   String getEffectiveLogHome() {
-    if (!getDomain().getLogHomeEnabled()) return "";
+    if (!getDomain().getLogHomeEnabled()) return null;
     String logHome = getLogHome();
     if (logHome == null || "".equals(logHome.trim())) {
       // logHome not specified, use default value

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

@@ -138,8 +138,12 @@ private String getLogHome() {
     return getDomain().getLogHome();
   }
 
-  private String getEffectiveLogHome() {
-    if (!getDomain().getLogHomeEnabled()) return "";
+  protected boolean isDomainHomeInImage() {
+    return getDomain().isDomainHomeInImage();
+  }
+
+  String getEffectiveLogHome() {
+    if (!getDomain().getLogHomeEnabled()) return null;
     String logHome = getLogHome();
     if (logHome == null || "".equals(logHome.trim())) {
       // logHome not specified, use default value
@@ -430,6 +434,7 @@ public NextAction apply(Packet packet) {
         logPodExists();
         return doNext(packet);
       } else {
+        LOGGER.info(MessageKeys.CYCLING_POD, currentPod, getPodModel());
         return doNext(replaceCurrentPod(getNext()), packet);
       }
     }

operator/src/main/java/oracle/kubernetes/operator/logging/MessageKeys.java

@@ -145,4 +145,5 @@ private MessageKeys() {}
   public static final String CANNOT_PARSE_INTROSPECTOR_RESULT = "WLSKO-0142";
   public static final String CANNOT_PARSE_INTROSPECTOR_FILE = "WLSKO-0143";
   public static final String CANNOT_START_DOMAIN_AFTER_MAX_RETRIES = "WLSKO-0144";
+  public static final String CYCLING_POD = "WLSKO-0145";
 }

operator/src/main/resources/Operator.properties

@@ -142,4 +142,5 @@ WLSKO-0140=Job {0} is completed with status: {1}
 WLSKO-0141=Failed to parse WebLogic Domain topology due to exception: {0}
 WLSKO-0142=Failed to parse results from domain introspector for domain {0} due to exception: {1}
 WLSKO-0143=Failed to parse file {0} from domain introspector for domain {1} due to exception: {2}
-WLSKO-0144=Unable to start domain with domainUID {0} in namespace {1} after {2} attempts due to exception: {3}
+WLSKO-0144=Unable to start domain with domainUID {0} in namespace {1} after {2} attempts due to exception: {3}
+WLSKO-0145=Replacing pod {0} with {1}

operator/src/test/java/oracle/kubernetes/operator/helpers/PodHelperTestBase.java

@@ -325,8 +325,8 @@ public void whenPodCreated_hasPredefinedEnvVariables() {
             hasEnvVar("ADMIN_PASSWORD", null),
             hasEnvVar("DOMAIN_UID", UID),
             hasEnvVar("NODEMGR_HOME", NODEMGR_HOME),
-            hasEnvVar("SERVER_OUT_IN_POD_LOG", INCLUDE_SERVER_OUT_IN_POD_LOG_STRING),
-            hasEnvVar("LOG_HOME", ""),
+            hasEnvVar("SERVER_OUT_IN_POD_LOG", Boolean.toString(INCLUDE_SERVER_OUT_IN_POD_LOG)),
+            hasEnvVar("LOG_HOME", null),
             hasEnvVar("SERVICE_NAME", LegalNames.toServerServiceName(UID, getServerName())),
             hasEnvVar("AS_SERVICE_NAME", LegalNames.toServerServiceName(UID, ADMIN_SERVER))));
   }
@@ -620,8 +620,9 @@ V1Container createPodSpecContainer() {
         .addEnvItem(envItem("ADMIN_PASSWORD", null))
         .addEnvItem(envItem("DOMAIN_UID", UID))
         .addEnvItem(envItem("NODEMGR_HOME", NODEMGR_HOME))
-        .addEnvItem(envItem("SERVER_OUT_IN_POD_LOG", INCLUDE_SERVER_OUT_IN_POD_LOG_STRING))
-        .addEnvItem(envItem("LOG_HOME", ""))
+        .addEnvItem(
+            envItem("SERVER_OUT_IN_POD_LOG", Boolean.toString(INCLUDE_SERVER_OUT_IN_POD_LOG)))
+        .addEnvItem(envItem("LOG_HOME", null))
         .addEnvItem(envItem("SERVICE_NAME", LegalNames.toServerServiceName(UID, getServerName())))
         .addEnvItem(envItem("AS_SERVICE_NAME", LegalNames.toServerServiceName(UID, ADMIN_SERVER)))
         .livenessProbe(createLivenessProbe())