remove failBootOnSituationalError from DomainSpec. Doc fixes

Author: alai8

docs-source/content/userguide/managing-domains/configoverrides/_index.md

@@ -338,10 +338,10 @@ spec:
 
 Incorrectly formatted override files may be accepted without warnings or errors and will not prevent WebLogic pods from booting. So, it is important to make sure that the template files are correct in a QA environment, otherwise your WebLogic Servers may start even though critically required overrides are failing to take effect.
 
-On WebLogic Servers that support the `weblogic.SituationalConfig.failBootOnError` system property ( Note: It is not supported in WebLogic Server 12.2.1.3.0 ), 
-by default the WebLogic server will fail to boot if any situational configuration files are invalid.
-By setting the `failBootOnSituationalError` attribute in the Domain spec to `false`, you can start up the WebLogic Servers even with 
-incorrectly formatted override files.
+On WebLogic Servers that support the `weblogic.SituationalConfig.failBootOnError` system property ( Note: It is not supported in WebLogic Server 12.2.1.3.0 ),
+by default the WebLogic server will fail to boot if any situational configuration files are invalid,
+if it encounters an error while loading situational configuration files.
+By setting the `FAIL_BOOT_ON_SITUATIONAL_CONFIG_ERROR` environment variable in the Kubernetes containers for the WebLogic Servers to `false`, you can start up the WebLogic Servers even with incorrectly formatted override files.
 
 * Make sure you've followed each step in the [Step-by-step guide](#step-by-step-guide).
 

docs/domains/Domain.json

@@ -270,10 +270,6 @@
           "description": "The in-pod name of the directory in which to store the domain, node manager, server logs, and server  *.out files",
           "type": "string"
         },
-        "failBootOnSituationalError": {
-          "description": "In WebLogic Server versions that support this feature (greater than 12.2.1.3.0):  \u003cli\u003eIf true (the default) the WebLogic Server would fail to boot if it encounters an error while loading situational configuration files during server startup, or if any situational configuration file has an invalid format, \u003c/li\u003e \u003cli\u003eIf false, and if there are errors in the situational configuration files, then WebLogic Server would start but some configuration overrides may be skipped.\u003c/li\u003e",
-          "type": "boolean"
-        },
         "includeServerOutInPodLog": {
           "description": "If true (the default), the server .out file will be included in the pod\u0027s stdout.",
           "type": "boolean"

docs/domains/Domain.md

@@ -23,7 +23,6 @@ DomainSpec is a description of a domain.
 | `domainHome` | string | The folder for the WebLogic Domain. Not required. Defaults to /shared/domains/domains/domainUID if domainHomeInImage is false Defaults to /u01/oracle/user_projects/domains/ if domainHomeInImage is true |
 | `domainHomeInImage` | Boolean | True if this domain's home is defined in the docker image for the domain. Defaults to true. |
 | `domainUID` | string | Domain unique identifier. Must be unique across the Kubernetes cluster. Not required. Defaults to the value of metadata.name |
-| `failBootOnSituationalError` | Boolean | In WebLogic Server versions that support this feature (greater than 12.2.1.3.0):  <li>If true (the default) the WebLogic Server would fail to boot if it encounters an error while loading situational configuration files during server startup, or if any situational configuration file has an invalid format, </li> <li>If false, and if there are errors in the situational configuration files, then WebLogic Server would start but some configuration overrides may be skipped.</li> |
 | `image` | string | The WebLogic Docker image; required when domainHomeInImage is true; otherwise, defaults to container-registry.oracle.com/middleware/weblogic:12.2.1.3. |
 | `imagePullPolicy` | string | The image pull policy for the WebLogic Docker image. Legal values are Always, Never and IfNotPresent. Defaults to Always if image ends in :latest, IfNotPresent otherwise. |
 | `imagePullSecrets` | array of [Local Object Reference](k8s1.13.5.md#local-object-reference) | A list of image pull secrets for the WebLogic Docker image. |

docs/domains/index.html

@@ -1190,10 +1190,6 @@
           "description": "The in-pod name of the directory in which to store the domain, node manager, server logs, and server  *.out files",
           "type": "string"
         },
-        "failBootOnSituationalError": {
-          "description": "In WebLogic Server versions that support this feature (greater than 12.2.1.3.0):  \u003cli\u003eIf true (the default) the WebLogic Server would fail to boot if it encounters an error while loading situational configuration files during server startup, or if any situational configuration file has an invalid format, \u003c/li\u003e \u003cli\u003eIf false, and if there are errors in the situational configuration files, then WebLogic Server would start but some configuration overrides may be skipped.\u003c/li\u003e",
-          "type": "boolean"
-        },
         "includeServerOutInPodLog": {
           "description": "If true (the default), the server .out file will be included in the pod\u0027s stdout.",
           "type": "boolean"

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

@@ -345,10 +345,6 @@ public boolean isIncludeServerOutInPodLog() {
     return spec.getIncludeServerOutInPodLog();
   }
 
-  public boolean isFailBootOnSituationalError() {
-    return spec.getFailBootOnSituationalError();
-  }
-
   public boolean isDomainHomeInImage() {
     return spec.isDomainHomeInImage();
   }

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

@@ -99,23 +99,6 @@ public class DomainSpec extends BaseConfiguration {
   @Description("If true (the default), the server .out file will be included in the pod's stdout.")
   private Boolean includeServerOutInPodLog;
 
-  /**
-   * Whether to fail to WebLogic server boot if any situational configuration error occurs during
-   * server startup. Default is true.
-   *
-   * @since 2.3.0
-   */
-  @Description(
-      "In WebLogic Server versions that support this feature (greater than 12.2.1.3.0): "
-          + " <li>If true (the default) the WebLogic Server would fail to boot"
-          + " if it encounters an error while loading situational configuration files"
-          + " during server startup, or if any situational configuration file has an invalid format,"
-          + " </li>"
-          + " <li>If false, and if there are errors in the situational configuration "
-          + "files, then WebLogic Server would start but some configuration overrides may"
-          + " be skipped.</li>")
-  private Boolean failBootOnSituationalError;
-
   /**
    * The WebLogic Docker image.
    *
@@ -429,21 +412,6 @@ public DomainSpec withIncludeServerOutInPodLog(boolean includeServerOutInPodLog)
     return this;
   }
 
-  /**
-   * @return whether to fail WebLogic server boot if any error occurs when applying situational
-   *     configuration files during server startup.
-   * @since 2.3.0
-   */
-  boolean getFailBootOnSituationalError() {
-    return Optional.ofNullable(failBootOnSituationalError)
-        .orElse(KubernetesConstants.DEFAULT_FAIL_BOOT_ON_SITUATIONAL_ERROR);
-  }
-
-  public DomainSpec withFailBootOnSituationalError(boolean failBootOnSituationalError) {
-    this.failBootOnSituationalError = failBootOnSituationalError;
-    return this;
-  }
-
   /**
    * Returns true if this domain's home is defined in the default docker image for the domain.
    *
@@ -551,7 +519,6 @@ public String toString() {
             .append("logHome", logHome)
             .append("logHomeEnabled", logHomeEnabled)
             .append("includeServerOutInPodLog", includeServerOutInPodLog)
-            .append("failBootOnSituationalError", failBootOnSituationalError)
             .append("configOverrides", configOverrides)
             .append("configOverrideSecrets", configOverrideSecrets);
 

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

@@ -207,10 +207,6 @@ private String getIncludeServerOutInPodLog() {
     return Boolean.toString(getDomain().isIncludeServerOutInPodLog());
   }
 
-  private boolean getFailBootOnSituationalError() {
-    return getDomain().isFailBootOnSituationalError();
-  }
-
   private List<V1ContainerPort> getContainerPorts() {
     if (scan != null) {
       List<V1ContainerPort> ports = new ArrayList<>();
@@ -818,9 +814,6 @@ void overrideContainerWeblogicEnvVars(List<V1EnvVar> vars) {
     addEnvVar(
         vars, "SERVICE_NAME", LegalNames.toServerServiceName(getDomainUID(), getServerName()));
     addEnvVar(vars, "AS_SERVICE_NAME", LegalNames.toServerServiceName(getDomainUID(), getAsName()));
-    if (!getFailBootOnSituationalError()) {
-      addEnvVar(vars, "FAIL_BOOT_ON_SITUATIONAL_ERROR", "false");
-    }
     if (mockWLS()) {
       addEnvVar(vars, "MOCK_WLS", "true");
     }

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

@@ -27,7 +27,7 @@
 #                       Default:
 #                          Use LOG_HOME.  If LOG_HOME not set, use NODEMGR_HOME.
 #   ADMIN_PORT_SECURE = "true" if the admin protocol is secure. Default is false
-#   FAIL_BOOT_ON_SITUATIONAL_ERROR = "true" if WebLogic server should fail to 
+#   FAIL_BOOT_ON_SITUATIONAL_CONFIG_ERROR = "true" if WebLogic server should fail to 
 #                       boot if situational configuration related errors are 
 #                       found. Default to "true" if unspecified.
 #
@@ -116,14 +116,14 @@ export NODEMGR_HOME=${NODEMGR_HOME}/${DOMAIN_UID}/${SERVER_NAME}
 createFolder ${NODEMGR_HOME} 
 
 NODEMGR_LOG_HOME=${NODEMGR_LOG_HOME:-${LOG_HOME:-${NODEMGR_HOME}/${DOMAIN_UID}}}
-FAIL_BOOT_ON_SITUATIONAL_ERROR=${FAIL_BOOT_ON_SITUATIONAL_ERROR:-true}
+FAIL_BOOT_ON_SITUATIONAL_CONFIG_ERROR=${FAIL_BOOT_ON_SITUATIONAL_CONFIG_ERROR:-true}
 
 trace "Info: NODEMGR_HOME='${NODEMGR_HOME}'"
 trace "Info: LOG_HOME='${LOG_HOME}'"
 trace "Info: SERVER_NAME='${SERVER_NAME}'"
 trace "Info: DOMAIN_UID='${DOMAIN_UID}'"
 trace "Info: NODEMGR_LOG_HOME='${NODEMGR_LOG_HOME}'"
-trace "Info: FAIL_BOOT_ON_SITUATIONAL_ERROR='${FAIL_BOOT_ON_SITUATIONAL_ERROR}'"
+trace "Info: FAIL_BOOT_ON_SITUATIONAL_CONFIG_ERROR='${FAIL_BOOT_ON_SITUATIONAL_CONFIG_ERROR}'"
 
 createFolder ${NODEMGR_LOG_HOME}
 
@@ -244,7 +244,7 @@ RestartInterval=3600
 NumberOfFilesLimited=true
 FileTimeSpan=24
 NMHostName=${SERVICE_NAME}
-Arguments=${USER_MEM_ARGS} -XX\\:+UnlockExperimentalVMOptions -XX\\:+UseCGroupMemoryLimitForHeap -Dweblogic.SituationalConfig.failBootOnError=${FAIL_BOOT_ON_SITUATIONAL_ERROR} ${serverOutOption} ${JAVA_OPTIONS}
+Arguments=${USER_MEM_ARGS} -XX\\:+UnlockExperimentalVMOptions -XX\\:+UseCGroupMemoryLimitForHeap -Dweblogic.SituationalConfig.failBootOnError=${FAIL_BOOT_ON_SITUATIONAL_CONFIG_ERROR} ${serverOutOption} ${JAVA_OPTIONS}
 
 EOF
 

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

@@ -473,14 +473,6 @@ public void whenPodCreated_withoutLogHomeSpecified_hasDefaultLogHomeEnvVariable(
         getCreatedPodSpecContainer().getEnv(), allOf(hasEnvVar("LOG_HOME", LOG_HOME + "/" + UID)));
   }
 
-  @Test
-  public void whenPodCreated_withFalseFailBootOnSituationalError_hasEnvVariable() {
-    domainPresenceInfo.getDomain().getSpec().withFailBootOnSituationalError(false);
-    assertThat(
-        getCreatedPodSpecContainer().getEnv(),
-        allOf(hasEnvVar("FAIL_BOOT_ON_SITUATIONAL_ERROR", "false")));
-  }
-
   static Matcher<Iterable<? super V1EnvVar>> hasEnvVar(String name, String value) {
     return hasItem(new V1EnvVar().name(name).value(value));
   }