Merge branch 'owls-70659' of https://github.com/oracle/weblogic-kubernetes-operator into owls-70659

Author: rjeberhard

README.md

@@ -18,7 +18,7 @@ Oracle is finding ways for organizations using WebLogic Server to run important
 * Scale WebLogic domains by starting and stopping Managed Servers on demand, or by integrating with a REST API to initiate scaling based on WLDF, Prometheus, Grafana, or other rules.
 * Publish operator and WebLogic Server logs into Elasticsearch and interact with them in Kibana.
 
-The fastest way to experience the operator is to follow the [Quick start guide](site/quickstart.md), or you can peruse our [documentation](site), read our blogs, or try out the [samples](kubernetes/samples/README.md).
+The fastest way to experience the operator is to follow the [Quick start guide](site/quickstart.md), or you can peruse our [documentation](site), read our [blogs](https://blogs.oracle.com/weblogicserver/how-to-weblogic-server-on-kubernetes), or try out the [samples](kubernetes/samples/README.md).
 
 # About this documentation
 
@@ -52,7 +52,15 @@ The [User guide](site/user-guide.md) provides detailed information about all asp
 
 # Samples
 
-**TODO** put a list of samples here with a summary and links
+Please refer to our [samples](kubernetes/samples/README.md) for information about the available sample code we provide.
+
+# Need more help?
+
+We have a public Slack channel where you can get in touch with us to ask questions about using the operator.  To join our channel, please [visit this site to get an invitation](https://weblogic-slack-inviter.herokuapp.com/).  The invitation email will include details of how to access our Slack workspace.  After you are logged in, please come to #operator and say, "hello!"
+
+# Recent changes
+
+See [Recent changes](site/recent-changes.md) for changes to the operator, including any backward incompatible changes.
 
 # Developer guide
 
@@ -70,15 +78,6 @@ Documentation for APIs is provided here:
 
 * [Javadoc](https://oracle.github.io/weblogic-kubernetes-operator/apidocs/index.html) for the operator.
 
-## Need more help?
-
-We have a public Slack channel where you can get in touch with us to ask questions about using the operator.  To join our channel, please [visit this site to get an invitation](https://weblogic-slack-inviter.herokuapp.com/).  The invitation email will include details of how to access our Slack workspace.  After you are logged in, please come to #operator and say, "hello!"
-
-## Recent changes
-
-See [Recent changes](site/recent-changes.md) for changes to the operator, including any backward incompatible changes.
-
-
 # Contributing to the operator
 
 Oracle welcomes contributions to this project from anyone.  Contributions may be reporting an issue with the operator or submitting a pull request.  Before embarking on significant development that may result in a large pull request, it is recommended that you create an issue and discuss the proposed changes with the existing developers first.

integration-tests/README.md

@@ -48,7 +48,12 @@ Full test use cases
 * shutdown and delete domain7
 * create domain domain8 and test that create domain fails when its pv is already populated by a shutdown domain
 * create another domain domain9 with APACHE load balancer and access admin console via LB port. shutdown domain.
-* create another domain domain10 with mostly default values from sample domain inputs, mainly exposeAdminT3Channel and exposeAdminNodePort which are false by default and verify domain startup and cluster scaling using operator rest endpoint works. 
+* create another domain domain10 with mostly default values from sample domain inputs, mainly exposeAdminT3Channel and exposeAdminNodePort which are false by default and verify domain startup and cluster scaling using operator rest endpoint works.
+* create another domain domain11 with listen address not set for admin server and t3 channel and incorrect file for admin server log
+* verify automatic situational config override works by bringing up the domain and by doing checks 2 - 5 listed in quick test
+* create another domain domain12 with some junk value for t3 channel public address and using custom situational config override replace with valid public address
+* verify the domain by doing checks 2 - 5 listed in quick test
+ 
 
 
 # Directory Configuration and Structure

integration-tests/pom.xml

@@ -59,12 +59,12 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>25.1-jre</version>
+			<version>${guava-version}</version>
 		</dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.21</version>            
+            <version>${snakeyaml-version}</version>
         </dependency>
         <dependency>
             <groupId>io.kubernetes</groupId>