minor doc updates: logHome and dataHome usage (#2308)

Author: Tom Barnes

documentation/domains/Domain.json

@@ -325,7 +325,7 @@
           "$ref": "#/definitions/AdminServer"
         },
         "logHome": {
-          "description": "The directory in a server\u0027s container in which to store the domain, Node Manager, server logs, server *.out, introspector .out, and optionally HTTP access log files if `httpAccessLogInLogHome` is true. Ignored if `logHomeEnabled` is false.",
+          "description": "The directory in a server\u0027s container in which to store the domain, Node Manager, server logs, server *.out, introspector .out, and optionally HTTP access log files if `httpAccessLogInLogHome` is true. Default is `/shared/logs/DOMAIN-UID`. Ignored if `logHomeEnabled` is false.",
           "type": "string"
         },
         "includeServerOutInPodLog": {

documentation/domains/Domain.md

@@ -32,7 +32,7 @@ The specification of the operation of the WebLogic domain. Required.
 | `includeServerOutInPodLog` | Boolean | Specifies whether the server .out file will be included in the Pod's log. Defaults to true. |
 | `introspectVersion` | string | Changes to this field cause the operator to repeat its introspection of the WebLogic domain configuration. Repeating introspection is required for the operator to recognize changes to the domain configuration, such as adding a new WebLogic cluster or Managed Server instance, to regenerate configuration overrides, or to regenerate the WebLogic domain home when the `domainHomeSourceType` is FromModel. Introspection occurs automatically, without requiring change to this field, when servers are first started or restarted after a full domain shut down. For the FromModel `domainHomeSourceType`, introspection also occurs when a running server must be restarted because of changes to any of the fields listed here: https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/domain-lifecycle/startup/#properties-that-cause-servers-to-be-restarted. See also `domains.spec.configuration.overrideDistributionStrategy`. |
 | `livenessProbeCustomScript` | string | Full path of an optional liveness probe custom script for WebLogic Server instance pods. The existing liveness probe script `livenessProbe.sh` will invoke this custom script after the existing script performs its own checks. This element is optional and is for advanced usage only. Its value is not set by default. If the custom script fails with non-zero exit status, then pod will fail the liveness probe and Kubernetes will restart the container. If the script specified by this element value is not found, then it is ignored. |
-| `logHome` | string | The directory in a server's container in which to store the domain, Node Manager, server logs, server *.out, introspector .out, and optionally HTTP access log files if `httpAccessLogInLogHome` is true. Ignored if `logHomeEnabled` is false. |
+| `logHome` | string | The directory in a server's container in which to store the domain, Node Manager, server logs, server *.out, introspector .out, and optionally HTTP access log files if `httpAccessLogInLogHome` is true. Default is `/shared/logs/DOMAIN-UID`. Ignored if `logHomeEnabled` is false. |
 | `logHomeEnabled` | Boolean | Specifies whether the log home folder is enabled. Defaults to true if `domainHomeSourceType` is PersistentVolume; false, otherwise. |
 | `managedServers` | array of [Managed Server](#managed-server) | Lifecycle options for individual Managed Servers, including Java options, environment variables, additional Pod content, and the ability to explicitly start, stop, or restart a named server instance. The `serverName` field of each entry must match a Managed Server that already exists in the WebLogic domain configuration or that matches a dynamic cluster member based on the server template. |
 | `maxClusterConcurrentShutdown` | number | The default maximum number of WebLogic Server instances that a cluster will shut down in parallel when it is being partially shut down by lowering its replica count. You can override this default on a per cluster basis by setting the cluster's `maxConcurrentShutdown` field. A value of 0 means there is no limit. Defaults to 1. |

documentation/staging/content/userguide/managing-domains/configoverrides/_index.md

@@ -105,6 +105,7 @@ See [overrides distribution](#overrides-distribution) for a discussion of distri
 * Domain topology (cluster members)
 * Network channel listen address, port, and enabled configuration
 * Server and domain log locations
+* Default or custom file store directories when `domain.spec.dataHome` is set
 * Node Manager related configuration
 * Changing any existing MBean name
 * Adding or removing a module (for example, a JDBC module)
@@ -120,7 +121,8 @@ See [overrides distribution](#overrides-distribution) for a discussion of distri
   * Dynamic cluster size
   * Default, SSL, and Admin channel `Enabled`, listen address, and port
   * Network Access Point (custom channel), listen address, or port
-  * Server and domain log locations -- use the `logHome` domain setting instead
+  * Server and domain log locations -- use the `domain.spec.logHome` setting instead and ensure that `domain.spec.logHomeEnabled` is set to true
+  * Default or custom file store directories when `domain.spec.dataHome` is set
   * Node Manager access credentials
   * Any existing MBean name (for example, you cannot change the domain name)
 

kubernetes/crd/domain-crd.yaml

@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    weblogic.sha256: 184901e2753d12d5468f58f1e072d45ee257655d557ec30a4cdd0554c36d804a
+    weblogic.sha256: de883bb3d965b09f91bc60c21481d6d61f441ac6ddf9952a9189f85eb887b507
   name: domains.weblogic.oracle
 spec:
   group: weblogic.oracle
@@ -2943,7 +2943,8 @@ spec:
                 description: The directory in a server's container in which to store
                   the domain, Node Manager, server logs, server *.out, introspector
                   .out, and optionally HTTP access log files if `httpAccessLogInLogHome`
-                  is true. Ignored if `logHomeEnabled` is false.
+                  is true. Default is `/shared/logs/DOMAIN-UID`. Ignored if `logHomeEnabled`
+                  is false.
                 type: string
               includeServerOutInPodLog:
                 description: Specifies whether the server .out file will be included

kubernetes/crd/domain-v1beta1-crd.yaml

@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    weblogic.sha256: 184901e2753d12d5468f58f1e072d45ee257655d557ec30a4cdd0554c36d804a
+    weblogic.sha256: de883bb3d965b09f91bc60c21481d6d61f441ac6ddf9952a9189f85eb887b507
   name: domains.weblogic.oracle
 spec:
   group: weblogic.oracle
@@ -2937,7 +2937,8 @@ spec:
               description: The directory in a server's container in which to store
                 the domain, Node Manager, server logs, server *.out, introspector
                 .out, and optionally HTTP access log files if `httpAccessLogInLogHome`
-                is true. Ignored if `logHomeEnabled` is false.
+                is true. Default is `/shared/logs/DOMAIN-UID`. Ignored if `logHomeEnabled`
+                is false.
               type: string
             includeServerOutInPodLog:
               description: Specifies whether the server .out file will be included

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

@@ -100,6 +100,7 @@ public class DomainSpec extends BaseConfiguration {
       "The directory in a server's container in which to store the domain, Node Manager, server logs, "
           + "server *.out, introspector .out, and optionally HTTP access log files "
           + "if `httpAccessLogInLogHome` is true. "
+          + "Default is `/shared/logs/DOMAIN-UID`. "
           + "Ignored if `logHomeEnabled` is false.")
   private String logHome;