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

Author: vanajamukkara

Dockerfile

@@ -9,7 +9,7 @@
 # Pull base image
 # From the Docker store
 # -------------------------
-FROM store/oracle/serverjre:8
+FROM openjdk:11-oracle
 RUN yum -y install openssl && yum clean all
 
 # Maintainer

docs-source/content/userguide/managing-domains/domain-lifecycle/scaling.md

@@ -255,15 +255,15 @@ details about [Using Prometheus to Automatically Scale WebLogic Clusters on Kube
 
 ### Helpful Tips
 #### Debugging scalingAction.sh
-The [`scalingAction.sh`](/src/scripts/scaling/scalingAction.sh) script was designed to be executed within the
+The [`scalingAction.sh`](https://github.com/oracle/weblogic-kubernetes-operator/blob/master/src/scripts/scaling/scalingAction.sh) script was designed to be executed within the
 Administration Server pod because the associated diagnostic module is targed to the Administration Server.
 
 The easiest way to verify and debug the `scalingAction.sh` script is to open a shell on the running Administration Server pod and execute the script on the command line.
 
 The following example illustrates how to open a bash shell on a running Administration Server pod named `domain1-admin-server` and execute the `scriptAction.sh` script.  It assumes that:
 
 * The domain home is in `/u01/oracle/user-projects/domains/domain1` (that is, the domain home is inside a Docker image).
-* The Dockerfile copied [`scalingAction.sh`](/src/scripts/scaling/scalingAction.sh) to `/u01/oracle/user-projects/domains/domain1/bin/scripts/scalingAction.sh`.
+* The Dockerfile copied [`scalingAction.sh`](https://github.com/oracle/weblogic-kubernetes-operator/blob/master/src/scripts/scaling/scalingAction.sh) to `/u01/oracle/user-projects/domains/domain1/bin/scripts/scalingAction.sh`.
 
 ```
 > kubectl exec -it domain1-admin-server /bin/bash

docs/charts/index.yaml

@@ -10,7 +10,7 @@ entries:
     version: "2.2"
   - created: 2019-04-04T14:48:45.071125-04:00
     description: Helm chart for configuring the WebLogic operator.
-    digest: 89dc1fe3be6b005b8aa8c7fe00445f057328ec6a018520f4180ffea17fb7651c
+    digest: 391e23c0969ada5f0cd2a088ddc6f11f237f57521801ed3925db2149a8437a0d
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.1.tgz

docs/charts/weblogic-operator-2.1.tgz

@@ -14,93 +14,7 @@ Wercker runs only Quick test use cases, Jenkins runs both Quick and Full test us
 
 # Use Cases
 
-Java integration tests cover the below use cases:
-
-Quick test Configuration & Use Cases - 
-
-|  |  |
-| --- | --- |
-| Operator Configuration | operator1 deployed in `weblogic-operator1` namespace and manages domains in `default` and `test1` namespaces |
-| Domain Configuration | Domain on PV using WLST, Traefik load balancer |
-
-Basic Use Cases
-
-1. Create operator `operator1` which manages `default` and `test1` namespaces, verify it's deployed successfully, pods created, operator ready and verify external REST service, if configured.
-2. Create domain `domain1` in `default` namespace and verify the pods, services are created and servers are in ready state.
-3. Verify the admin external service by accessing the admin REST endpoint with `nodeport` in URL.
-4. Verify admin t3 channel port by exec into the admin pod and deploying webapp using the channel port for WLST.
-5. Verify web app load balancing by accessing the webapp using `loadBalancerWebPort`.
-
-Advanced Use Cases
-
-6. Verify domain life cycle (destroy and create) should not have any impact on operator managing the domain and web app load balancing and admin external service.
-7. Cluster scale up/down using operator REST endpoint, webapp load balancing should adjust accordingly.
-8. Operator life cycle (destroy and create) should not impact the running domain.
-
-Also the below use cases are covered for Quick test:
-
-9. Verify the liveness probe by killing managed server 1 process 3 times to kick pod auto-restart.
-10. Shutdown the domain by changing domain `serverStartPolicy` to `NEVER`.
-
-
-Full test Configuration & Use Cases - Runs Quick test Configuration & Use cases and the below
-
-|  |  |
-| --- | --- |
-| Operator Configuration | operator2 deployed in weblogic-operator2 namespace and manages domains test2 namespace |
-| Domain Configuration | Domain on PV using WDT <p> Domain home in image using WLST <p> Domain home in image using WDT <p> Domain with serverStartPolicy ADMIN_ONLY <p> Domain with auto and custom situational configuration <p> Two domains managed by two operators <p> Domain with Recycle weblogicDomainStorageReclaimPolicy <p> Domain with default sample values |
-
-
-Basic Use Cases described above are verified in all the domain configurations. Also the below use cases are covered:
-
-| Domain | Use Case |
-| --- | --- |
-| Domain on PV using WDT | WLDF scaling |
-| Domain with ADMIN_ONLY | making sure only admin server is started and managed servers are not started. Shutdown domain by deleting domain CRD. Create domain on existing PV dir, pv is already populated by a shutdown domain. |
-| Domain with situational config | create domain with listen address not set for admin server and t3 channel/NAP and incorrect file for admin server log location. Introspector should override these with sit-config automatically. Also, with some junk value for t3 channel public address and using custom situational config override replace with valid public address using secret. Also, on Jenkins this domain uses NFS instead of HOSTPATH PV storage |	
-| Two domains managed by two operators | verify scaling and restart of one domain doesn't impact another domain. Delete domain resources using delete script from samples. |			
-| Domain with Recycle policy | create domain with pvReclaimPolicy="Recycle" Verify that the PV is deleted once the domain and PVC are deleted |
-| Domain with default sample values | create domain using mostly default values for inputs |	
-| Domain home in image using WLST | cluster scaling |
-| Domain home in image using WDT  | cluster scaling |
-
-| Operator Usability | Use Case |
-| --- | --- |
-| Operator Helm Chart with Invalid Attributes | create chart with invalid attributes, verify that deployment fails with expected error |
-| Two Operators using same Operator Namespace | create two operators sharing same namespace,verify that deployment fails with expected error |
-| Operator Helm Chart using default target domains Namespace| create chart using default target domains namespace |
-| Operator Helm Chart using empty target domains Namespace| create chart using empty target domains namespace |
-| Operator Helm Chart using UpperCase target domains Namespace| create chart using invalid UpperCase target domains namespace, verify that deployment fails with expected error |
-| Operator Helm Chart using not preexisted Operator Namespace | create chart using not preexisted Operator namespace, verify that deployment will fail |
-| Operator Helm Chart using not preexisted Operator ServiceAccount | create chart using not preexisted Operator ServiceAccount, verify that deployment will fail, but will change to running after SA is created |
-| Operator Helm Chart create delete create | create delete create chart with same values |
-| Two Operators using same External Https Port | create chart using same https rest port as already running first operator, verify that deployment fails with expected error |
-| Two Operators using same target domains namespace | create chart using target domains namespace as already running first operator, verify that deployment fails with expected error |
-| Operator Helm Chart using not preexisted target domains namespace | create chart using not preexisted target domains namespace as already running first operator, verify that deployment fails with expected error |
-| Operator Helm Chart add/delete target domain namespaces (domain1, domain2) | create operator helm chart managing domain1, use upgrade to add domain2. Verify that operator is able to manage added domain (domain2). Use helm upgrade to remove domain1, verify that operator not able to manage anymore the deleted one(domain1) |
-| Operator Helm Chart delete operator helm chart, leave domain running | create operator helm chart and start domain1, delete operator helm chart, verify domain1 is still functional |
- 
-| Server Pods Restarted by modifying properties on the domain resource| Use Case |
-| --- | --- |
-| Server pods restarted by changing Env property | Verify admin and managed server pods being restarted by property change: `-Dweblogic.StdoutDebugEnabled=false` --> `-Dweblogic.StdoutDebugEnabled=true` |
-| Server pods restarted by changing image | Verify admin and managed server pods being restarted by property change: image: `store/oracle/weblogic:12.2.1.3` --> image: `store/oracle/weblogic:duplicate` |
-| Server pods restarted by changing imagePullPolicy | Verify  admin and managed server pods being restarted by property change: imagePullPolicy: IfNotPresent --> imagePullPolicy: Never |
-| Server pods restarted by changing includeServerOutInPodLog | Verify admin and managed server pods being restarted by property change: includeServerOutInPodLog: true --> includeServerOutInPodLog: false |
-| Server pods restarted by changing logHomeEnable | Verify admin and managed server pods being restarted by property change: logHomeEnabled: true --> logHomeEnabled: false |
-
-Configuration Overrides Usecases
-
-| Override | Usecase |
-| --- | --- |
-| Configuration override | Override the administration server properties `connect-timeout`, `max-message-size`, `restart-max`, `debug-server-life-cycle` and `debug-jmx-core` debug flags. Also T3Channel public address using Kubernetes secret. The override is verified by JMX client connecting to the serverConfig MBean tree and the values are checked against the expected values. The test client connects to the overridden T3 public address and port to connect to the MBean servers |
-| JDBC Resource Override | Override JDBC connection pool properties; `initialCapacity`, `maxCapacity`, `test-connections-on-reserve`, `connection-harvest-max-count`, `inactive-connection-timeout-seconds`. Override the JDBC driver parameters like data source `URL`, `DB` `user` and `password` using kubernetes secret. The test verifies the overridden functionality datasource `URL`, `user`, `password` by getting the data source connection and running DDL statement it is connected to. |
-| JMS Resource Override | Override UniformDistributedTopic Delivery Failure Parameters, `redelivery-limit` and `expiration-policy`. The JMX test client verifies the serverConfig MBean tree for the expected delivery failure parameters, `redelivery-limit` and `expiration-policy`. |
-| WLDF Resource Override | Override `wldf-instrumentation-monitor` and `harvester` in a diagnostics module. The test client verifies the new instrumentation monitors/harvesters set by getting the WLDF resource from serverConfig tree with expected values.  |
-
-| Session Migration | Use Case |
-| --- | --- |
-| Primary Server Repick | A backup server becomes the primary server when a primary server fails|
-| HTTP Session Migration | Verify in-memory HTTP session State replication |
+Use Cases covered in integration tests for the operator is available [here](USECASES.MD)
 
 # Directory Configuration and Structure
 
@@ -184,7 +98,7 @@ externalRestEnabled: true
 javaLoggingLevel: FINE
 ```
 
-src/integration-tests/resources/domainonpvwlst.yaml - input/customized properties for PV/Load Balancer/WebLogic Domain. Any property can be provided here from kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-inputs.yaml and kubernetes/samples/scripts/create-weblogic-domain-pv-pvc/create-pv-pvc-inputs.yaml. For all the properties that are not defined here, the default values in the sample inputs are used while generating inputs yaml.
+src/integration-tests/resources/domainonpvwlst.yaml - See [Input Yaml to the test](#input-yaml-to-the-test). For all the properties that are not defined here, the default values in the sample inputs are used while generating inputs yaml.
 
 ```
 adminServerName: admin-server
@@ -203,7 +117,25 @@ namespace: default
 
 Certain properties like weblogicDomainStoragePath, image, externalOperatorCert are populated at run time.
 
+# Input Yaml to the test
+
+The input yaml file(for example, domainonpvwlst.yaml) to the java test is used to override any or all the attributes in
+- samples domain inputs - click [here](https://github.com/oracle/weblogic-kubernetes-operator/blob/develop/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-inputs.yaml) to see samples create-domain-inputs file
+- PV/PVC inputs - click [here](https://github.com/oracle/weblogic-kubernetes-operator/blob/develop/kubernetes/samples/scripts/create-weblogic-domain-pv-pvc/create-pv-pvc-inputs.yaml) to see PV/PVC inputs file
+- load balancer attributes and
+- custom attributes that are used to provide more flexibility for creating the domain.
+
+Below are the load balancer attributes:
+- loadBalancer: value can be `TRAEFIK` or `VOYAGER`, default is `TRAEFIK`
+- loadBalancerWebPort: web port for the load balancer
+- ingressPerDomain: create ingress per domain or one ingress for all domains in multiple domain configuration, default is true. 
+
+**Note: System env variables LB_TYPE, INGRESSPERDOMAIN take precedence over the domain input attributes. These variables apply for the entire run, not just one domain.**
 
+Below are the custom attributes:
+- createDomainPyScript is used to provide a custom create-domain.py script for domain on pv using WLST or create-wls-domain.py for domain in image 
+- clusterType is used to create a CONFIGURED or DYNAMIC Cluster. Default is DYNAMIC. This is supported for domain on pv using WLST or domain in image using WDT configurations. 
+  
 # How does it work
 
 When the tests are run with mvn command,