Update example results in README

Signed-off-by: doxiao <[email protected]>

Author: doxiao

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/README.md

@@ -1,14 +1,14 @@
 # WebLogic Sample Domain Home on a Persistent Volume
 
-The sample scripts demonstrate the creation of a WebLogic domain home on an existing Kubernetes Persistent Volume (PV) and Persistent Volume Claim (PVC). The scripts also generate the domain resource YAML file, which can then be used to start the Kubernetes artifacts of the corresponding domain. Optionally, the scripts start up the domain resource, and WebLogic Server pods and services.
+The sample scripts demonstrate the creation of a WebLogic domain home on an existing Kubernetes Persistent Volume (PV) and Persistent Volume Claim (PVC). The scripts also generate the domain YAML file, which can then be used to start the Kubernetes artifacts of the corresponding domain. Optionally, the scripts start up the domain, and WebLogic Server pods and services.
 
 ## Prerequisites
 
 The following prerequisites must be handled prior to running the create domain script:
 * Make sure the WebLogic Operator is running.
-* Create a Kubernetes namespace for the domain resource unless the intention is to use the default namespace.
-* Create in the same Kubernetes namespace, the Kubernetes persistent volume where the domain home will be hosted, and the Kubernetes persistent volume claim for the domain resource. For samples to create a PV and PVC, refer to [Create sample PV and PVC](../../create-weblogic-domain-pv-pvc/README.md).
-* Create the Kubernetes secrets `username` and `password` of the admin account in the same Kubernetes namespace as the domain resource.
+* Create a Kubernetes namespace for the domain unless the intention is to use the default namespace.
+* Create in the same Kubernetes namespace, the Kubernetes persistent volume where the domain home will be hosted, and the Kubernetes persistent volume claim for the domain. For samples to create a PV and PVC, refer to [Create sample PV and PVC](../../create-weblogic-domain-pv-pvc/README.md).
+* Create the Kubernetes secrets `username` and `password` of the admin account in the same Kubernetes namespace as the domain.
 
 ## Using the script to create a domain
 
@@ -25,10 +25,10 @@ The script will perform the following steps:
 * Create a directory for the generated Kubernetes YAML files for this domain if it does not already exist.  The pathname is `/path/to/weblogic-operator-output-directory/weblogic-domains/<domainUID>`. Note that the script fails if the directory is not empty when the `create-domain.sh` script is executed.
 * Create a Kubernetes job that will start up a utility WebLogic Server container and run offline WLST scripts, or WebLogic Deploy Tool (WDT) scripts, to create the domain on the shared storage.
 * Run the job and wait for the job to finish.
-* Create a Kubernetes domain resource YAML file, `domain.yaml`, in the directory that is created above. This YAML file can be used to create the Kubernetes resource using the `kubectl create -f` or `kubectl apply -f` command.
+* Create a Kubernetes domain YAML file, `domain.yaml`, in the directory that is created above. This YAML file can be used to create the Kubernetes resource using the `kubectl create -f` or `kubectl apply -f` command.
 * Create a convenient utility script, `delete-domain-job.yaml`, to clean up the domain home created by the create script.
 
-As a convenience, using the `-e` option, the script can optionally create the domain resource object, which in turn results in the creation of the corresponding WebLogic Server pods and services as well.
+As a convenience, using the `-e` option, the script can optionally create the domain object, which in turn results in the creation of the corresponding WebLogic Server pods and services as well.
 
 The usage of the create script is as follows:
 
@@ -95,7 +95,7 @@ The following parameters can be provided in the inputs file.
 
 Note that the names of the Kubernetes resources in the generated YAML files may be formed with the value of some of the properties specified in the `create-inputs.yaml` file. Those properties include the `adminServerName`, `clusterName` and `managedServerNameBase`. If those values contain any characters that are invalid in a Kubernetes service name, those characters are converted to valid values in the generated YAML files. For example, an uppercase letter is converted to a lowercase letter and an underscore `("_")` is converted to a hyphen `("-")`.
 
-The sample demonstrates how to create a WebLogic domain home and associated Kubernetes resources for a domain that only has one cluster. In addition, the sample provides the capability for users to supply their own scripts to create the domain home for other use cases. The generated domain resource YAML file could also be modified to cover more use cases.
+The sample demonstrates how to create a WebLogic domain home and associated Kubernetes resources for a domain that only has one cluster. In addition, the sample provides the capability for users to supply their own scripts to create the domain home for other use cases. The generated domain YAML file could also be modified to cover more use cases.
 
 ## Verify the results
 
@@ -109,37 +109,54 @@ The content of the generated `domain.yaml`:
 
 ```
 # Copyright 2017, 2018, Oracle Corporation and/or its affiliates. All rights reserved.
+
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 #
-# This is an example of how to define a Domain Custom Resource.
+# This is an example of how to define a Domain resource.
 #
 apiVersion: "weblogic.oracle/v2"
 kind: Domain
 metadata:
   name: domain1
   namespace: default
+  labels:
+    weblogic.resourceVersion: domain-v2
+    weblogic.domainUID: domain1
+    weblogic.domainName: domain1
 spec:
   # The domainUID must be unique across the entire Kubernetes Cluster.   Each WebLogic Domain must
   # have its own unique domainUID.  This does not have to be the same as the Domain Name.  It is allowed
   # to have multiple Domains with the same Domain Name, but they MUST have different domainUID's.
   # The domainUID is also used to identify the Persistent Volume that belongs to/with this Domain.
   domainUID: domain1
   # The WebLogic Domain Name
-  domainName: base_domain
+  domainName: domain1
+  # The WebLogic Domain Home
+  domainHome: /shared/domains/domain1
+  # If the domain home is in the image
+  domainHomeInImage: false
   # The Operator currently does not support other images
-  image: "store/oracle/weblogic:12.2.1.3"
+  image: "store/oracle/weblogic:19.1.0.0"
   # imagePullPolicy defaults to "Always" if image version is :latest
   imagePullPolicy: "IfNotPresent"
   # Identify which Secret contains the credentials for pulling an image
-  imagePullSecrets:
-  - name:
+  #imagePullSecrets:
+  #- name:
   # Identify which Secret contains the WebLogic Admin credentials (note that there is an example of
   # how to create that Secret at the end of this file)
   adminSecret:
     name: domain1-weblogic-credentials
   # The name of the Admin Server
+  asName: "admin-server"
   # The Admin Server's ListenPort
   asPort: 7001
+  # Whether to include the server out file into the pod's stdout, default is true
+  includeServerOutInPodLog: true
+  # The in-pod name of the directory to store the domain, node manager, server logs, and server .out
+  # files in.
+  # If not specified or empty, domain log file, server logs, server out, and node manager log files
+  # will be stored in the default logHome location of /shared/logs/<domainUID>/.
+  logHome: /shared/logs/domain1
   # serverStartPolicy legal values are "NEVER", "ALWAYS", "IF_NEEDED", or "ADMIN_ONLY"
   # This determines which WebLogic Servers the Operator will start up when it discovers this Domain
   # - "ALWAYS" will start up all defined servers
@@ -148,13 +165,13 @@ spec:
   serverStartPolicy: "IF_NEEDED"
   # adminServer is used to configure the desired behavior for starting the administration server.
   adminServer:
-  # desiredState legal values are "RUNNING" or "ADMIN"
+  # serverStartState legal values are "RUNNING" or "ADMIN"
   # "RUNNING" means the listed server will be started up to "RUNNING" mode
   # "ADMIN" means the listed server will be start up to "ADMIN" mode
-    desiredState: "RUNNING"
+    serverStartState: "RUNNING"
     # The Admin Server's NodePort
     nodePort: 30701
-    # export the T3Channel as a service
+    # Uncomment to export the T3Channel as a service
     exportedNetworkAccessPoints:
       T3Channel: {}
     # an (optional) list of environment variable to be set on the server
@@ -163,28 +180,27 @@ spec:
       value: "-Dweblogic.StdoutDebugEnabled=false"
     - name: USER_MEM_ARGS
       value: "-Xms64m -Xmx256m "
-  # clusters is used to configure the desired behavior for starting member servers of a cluster.  
+  # clusters is used to configure the desired behavior for starting member servers of a cluster.
   # If you use this entry, then the rules will be applied to ALL servers that are members of the named clusters.
   clusters:
     cluster-1:
-      desiredState: "RUNNING"
+      serverStartState: "RUNNING"
       replicas: 2
       env:
       - name: JAVA_OPTIONS
         value: "-Dweblogic.StdoutDebugEnabled=false"
       - name: USER_MEM_ARGS
         value: "-Xms64m -Xmx256m "
-  # The number of managed servers to start from clusters not listed in clusters
+  # The number of managed servers to start for unlisted clusters
   # replicas: 1
   storage:
     predefined:
       claim: domain1-weblogic-sample-pvc
-
 ```
 
-### Verify the domain resource
+### Verify the domain
 
-To confirm that the domain resource was created, use this command:
+To confirm that the domain was created, use this command:
 
 ```
 kubectl describe domain DOMAINUID -n NAMESPACE
@@ -198,92 +214,102 @@ Here is an example of the output of this command:
 $ kubectl describe domain domain1
 Name:         domain1
 Namespace:    default
-Labels:       weblogic.domainName=base_domain
+Labels:       weblogic.domainName=domain1
               weblogic.domainUID=domain1
               weblogic.resourceVersion=domain-v2
 Annotations:  <none>
-API Version:  weblogic.oracle/v1
+API Version:  weblogic.oracle/v2
 Kind:         Domain
 Metadata:
-  Cluster Name:        
-  Creation Timestamp:  2018-10-31T12:59:15Z
-  Generation:          0
-  Resource Version:    1314703
-  Self Link:           /apis/weblogic.oracle/v1/namespaces/default/domains/domain1
-  UID:                 c52f5e11-dd0c-11e8-9238-fa163e855ac8
+  Cluster Name:
+  Creation Timestamp:  2018-12-07T04:32:13Z
+  Generation:          1
+  Resource Version:    351622
+  Self Link:           /apis/weblogic.oracle/v2/namespaces/default/domains/domain1
+  UID:                 11d951d0-f9d9-11e8-b751-fa163e855ac8
 Spec:
   Admin Secret:
-    Name:   domain1-weblogic-credentials
-  As Name:  admin-server
-  As Port:  7001
-  Cluster Startup:
-    Cluster Name:   cluster-1
-    Desired State:  RUNNING
-    Env:
-      Name:    JAVA_OPTIONS
-      Value:   -Dweblogic.StdoutDebugEnabled=false
-      Name:    USER_MEM_ARGS
-      Value:   -Xms64m -Xmx256m
-    Replicas:  2
+    Name:  domain1-weblogic-credentials
+  Admin Server:
+    Exported Network Access Points:
+      T 3 Channel:
+        Annotations:
+        Labels:
+    Node Port:  30701
+    Server Pod:
+      Container Security Context:
+      Env:
+      Liveness Probe:
+      Node Selector:
+      Pod Annotations:
+      Pod Labels:
+      Pod Security Context:
+      Readiness Probe:
+      Resources:
+        Limits:
+        Requests:
+      Volume Mounts:
+      Volumes:
+    Server Start State:  RUNNING
+  As Name:               admin-server
+  As Port:               7001
   Clusters:
-  Domain Home In Image:  false
-  Domain Name:           base_domain
-  Domain UID:            domain1
-  Env:
-  Export T 3 Channels:
-    T3Channel
-  Exported Network Access Points:
-  Image:              store/oracle/weblogic:12.2.1.3
-  Image Pull Policy:  IfNotPresent
-  Image Pull Secret:
-  Liveness Probe:
+    Cluster - 1:
+      Replicas:  2
+      Server Pod:
+        Container Security Context:
+        Env:
+        Liveness Probe:
+        Node Selector:
+        Pod Annotations:
+        Pod Labels:
+        Pod Security Context:
+        Readiness Probe:
+        Resources:
+          Limits:
+          Requests:
+        Volume Mounts:
+        Volumes:
+      Server Start State:         RUNNING
+  Domain Home:                    /shared/domains/domain1
+  Domain Home In Image:           false
+  Domain Name:                    domain1
+  Domain UID:                     domain1
+  Image:                          store/oracle/weblogic:19.1.0.0
+  Image Pull Policy:              IfNotPresent
+  Include Server Out In Pod Log:  true
+  Log Home:                       /shared/logs/domain1
   Managed Servers:
-  Readiness Probe:
-  Server Startup:
-    Desired State:  RUNNING
+  Server Pod:
+    Container Security Context:
     Env:
-      Name:         JAVA_OPTIONS
-      Value:        -Dweblogic.StdoutDebugEnabled=false
-      Name:         USER_MEM_ARGS
-      Value:        -Xms64m -Xmx256m
-    Node Port:      30701
-    Server Name:    admin-server
-  Startup Control:  AUTO
+    Liveness Probe:
+    Node Selector:
+    Pod Annotations:
+    Pod Labels:
+    Pod Security Context:
+    Readiness Probe:
+    Resources:
+      Limits:
+      Requests:
+    Volume Mounts:
+    Volumes:
+  Server Start Policy:  NEVER
   Storage:
     Predefined:
       Claim:  domain1-weblogic-sample-pvc
 Status:
   Conditions:
-    Last Transition Time:  2018-10-31T13:01:34.786Z
+    Last Transition Time:  2018-12-07T04:37:14.905Z
     Reason:                ServersReady
     Status:                True
     Type:                  Available
   Servers:
-    Health:
-      Activation Time:  2018-10-31T13:07:14.472Z
-      Overall Health:   ok
-      Subsystems:
-    Node Name:     xxxxxxxx
-    Server Name:   admin-server
-    State:         RUNNING
-    Cluster Name:  cluster-1
-    Health:
-      Activation Time:  2018-10-31T13:01:05.100Z
-      Overall Health:   ok
-      Subsystems:
-    Node Name:     xxxxxxxx
-    Server Name:   managed-server1
-    State:         RUNNING
-    Cluster Name:  cluster-1
-    Health:
-      Activation Time:  2018-10-31T13:01:05.190Z
-      Overall Health:   ok
-      Subsystems:
-    Node Name:    xxxxxxxx
-    Server Name:  managed-server2
-    State:        RUNNING
-  Start Time:     2018-10-31T12:59:15.244Z
+    Server Name:  admin-server
+    State:        SHUTDOWN
+  Start Time:     2018-12-07T04:32:13.779Z
 Events:           <none>
+
 ```
 
 In the `Status` section of the output, the available servers and clusters are listed.  Note that if this command is issued very soon after the script finishes, there may be no servers available yet, or perhaps only the Administration Server but no Managed Servers.  The operator will start up the Administration Server first and wait for it to become ready before starting Managed Servers.

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/domain-template.yaml

@@ -2,7 +2,7 @@
 
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 #
-# This is an example of how to define a Domain Custom Resource.
+# This is an example of how to define a Domain resource.
 #
 apiVersion: "weblogic.oracle/v2"
 kind: Domain