minor changes based on code review

Author: lennyphan

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

@@ -61,6 +61,7 @@
 import oracle.kubernetes.operator.work.Step;
 import oracle.kubernetes.weblogic.domain.model.Domain;
 import oracle.kubernetes.weblogic.domain.model.DomainStatus;
+import oracle.kubernetes.weblogic.domain.model.IntrospectorJobEnvVars;
 import oracle.kubernetes.weblogic.domain.model.ServerEnvVars;
 import oracle.kubernetes.weblogic.domain.model.ServerSpec;
 import oracle.kubernetes.weblogic.domain.model.Shutdown;
@@ -631,6 +632,11 @@ private void updateEnv(List<V1EnvVar> env) {
     updateEnvForShutdown(env);
     updateEnvForStartupMode(env);
     defineConfigOverride(env);
+    updateEnvWithDomainSourceType(env);
+  }
+
+  private void updateEnvWithDomainSourceType(List<V1EnvVar> env) {
+    addDefaultEnvVarIfMissing(env, IntrospectorJobEnvVars.DOMAIN_SOURCE_TYPE, getDomainHomeSourceType().toString());
   }
 
   private void updateEnvForShutdown(List<V1EnvVar> env) {

operator/src/main/resources/scripts/livenessProbe.sh

@@ -102,7 +102,7 @@ if [ $? != 0 ]; then
   exit $RETVAL
 fi
 
-if [ ! -f /weblogic-operator/introspector/domainzip.secure ]; then
+if [ ${DOMAIN_SOURCE_TYPE} != "FromModel" ]; then
   copySitCfgWhileRunning /weblogic-operator/introspector ${DOMAIN_HOME}/optconfig             'Sit-Cfg-CFG--'
   copySitCfgWhileRunning /weblogic-operator/introspector ${DOMAIN_HOME}/optconfig/jms         'Sit-Cfg-JMS--'
   copySitCfgWhileRunning /weblogic-operator/introspector ${DOMAIN_HOME}/optconfig/jdbc        'Sit-Cfg-JDBC--'

operator/src/main/resources/scripts/modelInImage.sh

@@ -801,8 +801,7 @@ function generateMergedModel() {
 
   trace "About to call '${WDT_BINDIR}/validateModel.sh ${wdtArgs}'."
 
-  ${WDT_BINDIR}/validateModel.sh -oracle_home ${ORACLE_HOME} ${model_list} \
-    ${archive_list} ${variable_list}  -domain_type ${WDT_DOMAIN_TYPE}  > ${WDT_OUTPUT} 2>&1
+  ${WDT_BINDIR}/validateModel.sh ${wdtArgs} > ${WDT_OUTPUT} 2>&1
   ret=$?
   if [ $ret -ne 0 ]; then
     trace SEVERE "Model in Image: the WDT validate model tool detected an error with the fully merged model:"
@@ -934,8 +933,7 @@ function wdtUpdateModelDomain() {
 
   trace "About to call '${WDT_BINDIR}/updateDomain.sh ${wdtArgs}'."
 
-  ${WDT_BINDIR}/updateDomain.sh -oracle_home ${ORACLE_HOME} -domain_home ${DOMAIN_HOME} $model_list \
-  ${archive_list} ${variable_list}  -domain_type ${WDT_DOMAIN_TYPE}  ${UPDATE_RCUPWD_FLAG}  >  ${WDT_OUTPUT} 2>&1
+  ${WDT_BINDIR}/updateDomain.sh ${wdtArgs} > ${WDT_OUTPUT} 2>&1
   ret=$?
 
   if [ $ret -ne 0 ]; then

operator/src/main/resources/scripts/model_wdt_mii_filter.py

@@ -4,9 +4,46 @@
 # ------------
 # Description:
 # ------------
-#  This is a model-in-image WDT filter for overriding WLS configuration, it
-#  replaces 'situational configuration overrides'.
+#   This is a model-in-image WDT filter for overriding WLS configuration, it
+#   replaces 'situational configuration overrides'.
 #
+#   This code is used by the operator during introspection for MII to manipulate
+#   the domain model.  It generates domain configuration information that's
+#   useful for running the domain, setting up its networking, and for overriding
+#   specific parts of its configuration so that it can run in k8s.
+#
+#   For more details, see the Model Filters description in the WebLogic Deploy
+#   Tooling in Github.
+#
+# ---------------------
+# Prerequisites/Inputs:
+# ---------------------
+#
+#   A domain model as a Jython dictionary.
+#
+#   The following env vars are required:
+#     DOMAIN_UID         - completely unique id for this domain
+#     DOMAIN_HOME        - path for the domain configuration
+#     LOG_HOME           - path to override WebLogic server log locations
+#     CREDENTIALS_SECRET_NAME  - name of secret containing credentials
+#
+#   The following env vars are optional:
+#     ACCESS_LOG_IN_LOG_HOME - HTTP access log files will be written to
+#                              the logHome directory.
+#     DATA_HOME - in-pod location for data storage of default and custom file
+#                 stores.
+#     CREDENTIALS_SECRET_PATH - directory path to secret containing credentials
+#
+# ---------------------------------
+# Result
+# ---------------------------------
+#
+#   The configuration overrides are directly modified in the domain model and
+#   include listen addresses, log file locations, etc.  The WebLogic Deploy
+#   Tooling will then generate/update the domain with the appropriate
+#   configuration.
+#
+
 
 import inspect
 import os
@@ -162,10 +199,10 @@ def customizeServerTemplates(model):
   template_names = serverTemplates.keys()
   if template_names is not None:
     for template_name in template_names:
-     template = serverTemplates[template_name]
-     cluster_name = getClusterNameOrNone(template)
-     if cluster_name is not None:
-       customizeServerTemplate(topology, template)
+      template = serverTemplates[template_name]
+      cluster_name = getClusterNameOrNone(template)
+      if cluster_name is not None:
+        customizeServerTemplate(topology, template)
 
 
 def customizeServerTemplate(topology, template):

operator/src/main/resources/scripts/startNodeManager.sh

@@ -241,7 +241,7 @@ if [ ! "${SERVER_NAME}" = "introspector" ]; then
     [ ! $? -eq 0 ] && trace SEVERE "Could not remove stale file '$wl_state_file'." && exit 1
   fi
 
-  if [ -f /weblogic-operator/introspector/domainzip.secure ]; then
+  if [ ${DOMAIN_SOURCE_TYPE} == "FromModel" ]; then
     # Domain source type is 'FromModel' (MII) then disable Situation config override for WebLogic.
     failBootOnErrorOption=""
   else

operator/src/main/resources/scripts/startServer.sh

@@ -102,7 +102,7 @@ function startWLS() {
 
   FAIL_BOOT_ON_SITUATIONAL_CONFIG_ERROR=${FAIL_BOOT_ON_SITUATIONAL_CONFIG_ERROR:-true}
   SERVER_OUT_MONITOR_INTERVAL=${SERVER_OUT_MONITOR_INTERVAL:-3}
-  if [ ! -f /weblogic-operator/introspector/domainzip.secure ]; then
+  if [ ${DOMAIN_SOURCE_TYPE} != "FromModel" ]; then
     # If Domain source type is not FromModel (MII) then monitor server logs for invalid
     # Situational config override files.
     if [ ${FAIL_BOOT_ON_SITUATIONAL_CONFIG_ERROR} == 'true' ] ; then
@@ -178,7 +178,7 @@ traceDirs before DOMAIN_HOME LOG_HOME DATA_HOME
 
 traceTiming "POD '${SERVICE_NAME}' MII UNZIP START"
 
-if [ -f /weblogic-operator/introspector/domainzip.secure ]; then
+if [ ${DOMAIN_SOURCE_TYPE} == "FromModel" ]; then
   prepareMIIServer
   if [ $? -ne 0 ] ; then
     trace SEVERE  "Domain Source Type is FromModel, unable to start the server, check other error messages in the log"
@@ -285,7 +285,7 @@ createFolder ${DOMAIN_HOME}/servers/${SERVER_NAME}/security
 copyIfChanged /weblogic-operator/introspector/boot.properties \
               ${DOMAIN_HOME}/servers/${SERVER_NAME}/security/boot.properties
 
-if [ ! -f /weblogic-operator/introspector/domainzip.secure ]; then
+if [ ${DOMAIN_SOURCE_TYPE} != "FromModel" ]; then
   trace "Copying situational configuration files from operator cm to ${DOMAIN_HOME}/optconfig directory"
   copySitCfgWhileBooting /weblogic-operator/introspector ${DOMAIN_HOME}/optconfig             'Sit-Cfg-CFG--'
   copySitCfgWhileBooting /weblogic-operator/introspector ${DOMAIN_HOME}/optconfig/jms         'Sit-Cfg-JMS--'