Merge branch 'develop' of https://github.com/oracle/weblogic-kubernetes-operator into logging-elastic-tests

Sync up with latest develop branch jenkins-ignore

Author: hzhao-github

build-tools/pom.xml

@@ -1,7 +1,7 @@
 <project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>oracle.kubernetes</groupId>
-  <artifactId>build-tools</artifactId>
-  <version>1.0</version>
-  <name>Build Tools</name>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>oracle.kubernetes</groupId>
+    <artifactId>build-tools</artifactId>
+    <version>1.0</version>
+    <name>Build Tools</name>
 </project>

buildtime-reports/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,26 +19,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>${maven-enforcer-plugin-version}</version>
-                <executions>
-                    <execution>
-                        <id>enforce-maven</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireMavenVersion>
-                                    <version>${maven.version.range}</version>
-                                </requireMavenVersion>
-                                <requireJavaVersion>
-                                    <version>${java.version.range}</version>
-                                </requireJavaVersion>
-                                <requirePluginVersions></requirePluginVersions>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>
@@ -48,7 +28,7 @@
             <id>reports</id>
             <activation>
                 <property>
-                  <name>!no-reports</name>
+                    <name>!no-reports</name>
                 </property>
             </activation>
             <build>

docs-source/content/developerguide/building.md

@@ -16,11 +16,7 @@ $ mvn clean install
 
 This will compile the source files, build JAR files containing the compiled classes and libraries needed to run the operator, and will also execute all of the unit tests.
 
-Contributions must conform to [coding and formatting standards]({{< relref "/developerguide/coding-standards.md" >}}).  To automatically update local code to conform to formatting standards, issue the following command:
-
-```
-$ mvn fmt:format
-```
+Contributions must conform to [coding and formatting standards]({{< relref "/developerguide/coding-standards.md" >}}).
 
 #### Building Javadoc
 

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

@@ -336,7 +336,12 @@ spec:
 ---
 ### Debugging
 
-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.
+Incorrectly formatted override files may be accepted without warnings or errors and may 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,
+or 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).
 
@@ -363,9 +368,17 @@ Incorrectly formatted override files may be accepted without warnings or errors
            ...
          ```
   * Look in your `DOMAIN_HOME/optconfig` directory.
-      * This directory, or a subdirectory within this directory, should contain each of your custom situational configuration files.
-      * If it doesn't, then this likely indicates your domain resource `configOverrides` was not set to match your custom override configuration map name, or that your custom override configuration map does not contain your override files.
-
+    * This directory, or a subdirectory within this directory, should contain each of your custom situational configuration files.
+    * If it doesn't, then this likely indicates your domain resource `configOverrides` was not set to match your custom override configuration map name, or that your custom override configuration map does not contain your override files.
+
+* If the Administration Server pod does start but fails to reach ready state or tries to restart:
+  * Check for this message ` WebLogic server failed to start due to missing or invalid situational configuration files` in the Administration Server pod's `kubectl log`
+    * This suggests that the Administration Server failure to start may have been caused by errors found in a configuration override file.
+      * Lines containing the String `situational` may be found in the Administration Server pod log to provide more hints. 
+      * For example:
+        * `<Jun 20, 2019 3:48:45 AM GMT> <Warning> <Management> <BEA-141323> <The situational config file has an invalid format, it is being ignored: XMLSituationalConfigFile[/shared/domains/domain1/optconfig/jdbc/testDS-0527-jdbc-situational-config.xml] because org.xml.sax.SAXParseException; lineNumber: 8; columnNumber: 3; The element type "jdbc:jdbc-driver-params" must be terminated by the matching end-tag "</jdbc:jdbc-driver-params>".`
+      * The warning message suggests a syntax error is found in the provided configuration override file for the testDS JDBC datasource.
+  
 * If you'd like to verify that the situational configuration is taking effect in the WebLogic MBean tree, then one way to do this is to compare the `server config` and `domain config` MBean tree values.
   * The `domain config` value should reflect the original value in your domain home configuration.
   * The `server config` value should reflect the overridden value.

docs/domains/Domain.json

@@ -145,14 +145,6 @@
           "description": "Unique, one-word, CamelCase reason for the condition\u0027s last transition.",
           "type": "string"
         },
-        "lastTransitionTime": {
-          "description": "Last time the condition transitioned from one status to another.",
-          "$ref": "#/definitions/DateTime"
-        },
-        "message": {
-          "description": "Human-readable message indicating details about last transition.",
-          "type": "string"
-        },
         "type": {
           "description": "The type of the condition. Valid types are Progressing, Available, and Failed. Required",
           "type": "string",
@@ -162,6 +154,14 @@
             "Failed"
           ]
         },
+        "lastTransitionTime": {
+          "description": "Last time the condition transitioned from one status to another.",
+          "$ref": "#/definitions/DateTime"
+        },
+        "message": {
+          "description": "Human-readable message indicating details about last transition.",
+          "type": "string"
+        },
         "lastProbeTime": {
           "description": "Last time we probed the condition.",
           "$ref": "#/definitions/DateTime"
@@ -274,18 +274,18 @@
           "description": "If true (the default), the server .out file will be included in the pod\u0027s stdout.",
           "type": "boolean"
         },
-        "managedServers": {
-          "description": "Configuration for the managed servers.",
+        "clusters": {
+          "description": "Configuration for the clusters.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/ManagedServer"
+            "$ref": "#/definitions/Cluster"
           }
         },
-        "clusters": {
-          "description": "Configuration for the clusters.",
+        "managedServers": {
+          "description": "Configuration for the managed servers.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/Cluster"
+            "$ref": "#/definitions/ManagedServer"
           }
         }
       }

docs/domains/index.html

@@ -1065,14 +1065,6 @@
           "description": "Unique, one-word, CamelCase reason for the condition\u0027s last transition.",
           "type": "string"
         },
-        "lastTransitionTime": {
-          "description": "Last time the condition transitioned from one status to another.",
-          "$ref": "#/definitions/DateTime"
-        },
-        "message": {
-          "description": "Human-readable message indicating details about last transition.",
-          "type": "string"
-        },
         "type": {
           "description": "The type of the condition. Valid types are Progressing, Available, and Failed. Required",
           "type": "string",
@@ -1082,6 +1074,14 @@
             "Failed"
           ]
         },
+        "lastTransitionTime": {
+          "description": "Last time the condition transitioned from one status to another.",
+          "$ref": "#/definitions/DateTime"
+        },
+        "message": {
+          "description": "Human-readable message indicating details about last transition.",
+          "type": "string"
+        },
         "lastProbeTime": {
           "description": "Last time we probed the condition.",
           "$ref": "#/definitions/DateTime"
@@ -1194,18 +1194,18 @@
           "description": "If true (the default), the server .out file will be included in the pod\u0027s stdout.",
           "type": "boolean"
         },
-        "managedServers": {
-          "description": "Configuration for the managed servers.",
+        "clusters": {
+          "description": "Configuration for the clusters.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/ManagedServer"
+            "$ref": "#/definitions/Cluster"
           }
         },
-        "clusters": {
-          "description": "Configuration for the clusters.",
+        "managedServers": {
+          "description": "Configuration for the managed servers.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/Cluster"
+            "$ref": "#/definitions/ManagedServer"
           }
         }
       }

integration-tests/README.md

@@ -152,11 +152,11 @@ When the tests are run with mvn command,
 - archive logs and results
 - cleanup the tmp files, PV dir and k8s artifacts created for the test
 
-All the tests that start with IT*.java in integration-tests/src/test/java are run. 
+All the tests that start with It*.java in integration-tests/src/test/java are run. 
 
 **Integration test classes:**
 
-When the integration test class ITOperator is executed, staticPrepare() method is called once before any of the test methods in the class and staticUnPrepare() method once at the end.
+When the integration test class ItOperator is executed, staticPrepare() method is called once before any of the test methods in the class and staticUnPrepare() method once at the end.
 
 staticPrepare() - initializes the application properties from OperatorIT.properties and creates resultRoot, pvRoot, userprojectsDir directories by calling initialize() method from the base class BaseTest.
 
@@ -266,7 +266,7 @@ Failed run will have the output like
 [INFO] Results:
 [INFO]
 [ERROR] Errors:
-[ERROR]   ITOperator.testDomainOnPVUsingWLST:145 ? Runtime FAILURE: Couldn't create serv...
+[ERROR]   ItOperator.testDomainOnPVUsingWLST:145 ? Runtime FAILURE: Couldn't create serv...
 [INFO]
 [ERROR] Tests run: 9, Failures: 0, Errors: 1, Skipped: 0
 [INFO]
@@ -292,7 +292,7 @@ Failed run will have the output like
 [INFO] Finished at: 2019-02-11T09:42:08-08:00
 [INFO] Final Memory: 124M/1534M
 ```
-JUnit test results can be seen at "integration-tests/target/failsafe-reports/TEST-oracle.kubernetes.operator.ITOperator.xml". This file shows how much time each test case took to run and the failed test results if any.
+JUnit test results can be seen at "integration-tests/target/failsafe-reports/TEST-oracle.kubernetes.operator.ItOperator.xml". This file shows how much time each test case took to run and the failed test results if any.
 
 # How to run JRF domain In Operator related tests
 * Setup docker access to FMW Infrastructure 12c Image and Oracle Database 12c Image
@@ -318,11 +318,11 @@ mvn clean verify -P jrf-integration-tests 2>&1 | tee log.txt
 
 # How to run a single test
 
-mvn -Dit.test="ITOperator#testDomainOnPVUsingWLST" -DfailIfNoTests=false integration-test -P java-integration-tests
+mvn -Dit.test="ItOperator#testDomainOnPVUsingWLST" -DfailIfNoTests=false integration-test -P java-integration-tests
 
 # How to run multiple tests
 
-mvn -Dit.test="ITOperator#testDomainOnPVUsingWLST+testDomainOnPVUsingWDT" -DfailIfNoTests=false integration-test -P java-integration-tests
+mvn -Dit.test="ItOperator#testDomainOnPVUsingWLST+testDomainOnPVUsingWDT" -DfailIfNoTests=false integration-test -P java-integration-tests
 
 # How to run cleanup script
 
@@ -343,9 +343,9 @@ $PV_ROOT/acceptance_test_pv is archived under $PV_ROOT/acceptance_test_pv_archiv
 
 Add a new JUnit test under integration-tests/src/test/java/oracle/kubernetes/operator.
 
-class name must start with IT(Integration Test), IT*.java
+class name must start with It(Integration Test), It*.java
 
-ITOperator.java - take a look at this test for reference
+ItOperator.java - take a look at this test for reference
 
 # Future enhancement