Merge pull request #608 from oracle/domain-sample-cleanup

Fix domain home in image sample

Author: markxnelson

kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/README.md

@@ -16,6 +16,8 @@ Make a copy of the `create-domain-inputs.yaml` file, and run the create script,
 
 ```
   ./create-domain.sh \
+  -u <username> \
+  -p <password> \
   -i create-domain-inputs.yaml \
   -o /path/to/output-directory
 ```
@@ -24,6 +26,8 @@ The script will perform the following steps:
 
 * Create a directory for the generated properties and 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 proerties file, `domain.properties`, in the directory that is created above. This properties file will be used to create a sample WebLogic Server domain.
+* Clone the weblogic docker-images project via the `git clone https://github.com/oracle/docker-images.git` into the current directory.
+* Replace the built-in username and password in the `properties/docker_build/domain_security.properties` file with the `username` and `password` that are supplied in the command line via the `-u` and `-p` options. These credentials need to match the WebLogic domain admin credentials in the secret that is specified via `weblogicCredentialsSecretName` property in the `create-domain-inputs.yaml` file.
 * Build Docker image based on Docker sample [Example Image with a WebLogic Server Domain](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-domain-home-in-image). It will create a sample WebLogic Server domain into the Docker image. You can also run the Docker sample [Example Image with a WebLogic Server Domain](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-domain-home-in-image) manually with the generated `domain.properties` to create domain home image. Note: Oracle recommends keeping the domain home image private in the local repository.
 * 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.
 
@@ -33,10 +37,12 @@ The usage of the create script is as follows:
 
 ```
 $ sh create-domain.sh -h
-usage: create-domain.sh -o dir -i file [-e] [-h]
+usage: create-domain.sh -o dir -i file -u username -p password [-e] [-h]
   -i Parameter inputs file, must be specified.
-  -o Output directory for the generated properties and YAML files, must be specified.
-  -e Also create the resources in the generated YAML file, optional.
+  -o Ouput directory for the generated properties and YAML files, must be specified.
+  -u Username used in building the Docker image for WebLogic domain in image.
+  -p Password used in building the Docker image for WebLogic domain in image.
+  -e Also create the resources in the generated YAML files, optional.
   -h Help
 
 ```
@@ -68,6 +74,7 @@ The following parameters can be provided in the inputs file.
 | `domainUID` | Unique ID that will be used to identify this particular domain. Used as the name of the generated WebLogic domain as well as the name of the Kubernetes domain resource. This ID must be unique across all domains in a Kubernetes cluster. This ID cannot contain any character that is not valid in a Kubernetes service name. | `domain1` |
 | `exposeAdminNodePort` | Boolean indicating if the Administration Server is exposed outside of the Kubernetes cluster. | `false` |
 | `exposeAdminT3Channel` | Boolean indicating if the T3 administrative channel is exposed outside the Kubernetes cluster. | `false` |
+| `includeServerOutInPodLog` | Boolean indicating whether to include server .out to the pod's stdout. | `true` |
 | `initialManagedServerReplicas` | Number of Managed Servers to initially start for the domain. | `2` |
 | `javaOptions` | Java options for starting the Administration and Managed Servers. A Java option can have references to one or more of the following pre-defined variables to obtain WebLogic domain information: `$(DOMAIN_NAME)`, `$(DOMAIN_HOME)`, `$(ADMIN_NAME)`, `$(ADMIN_PORT)`, and `$(SERVER_NAME)`. | `-Dweblogic.StdoutDebugEnabled=false` |
 | `managedServerNameBase` | Base string used to generate Managed Server names. | `managed-server` |
@@ -78,7 +85,6 @@ The following parameters can be provided in the inputs file.
 | `t3ChannelPort` | Port for the T3 channel of the NetworkAccessPoint. | `30012` |
 | `t3PublicAddress` | Public address for the T3 channel. | `kubernetes` |
 | `weblogicCredentialsSecretName` | Name of the Kubernetes secret for the Administration Server's username and password. | `domain1-weblogic-credentials` |
-| `includeServerOutInPodLog` | Boolean indicating whether to include server .out to the pod's stdout. | `true` |
 
 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 `("-")`.
 
@@ -108,15 +114,7 @@ metadata:
   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: domain1
   # The WebLogic Domain Home
   domainHome: /u01/oracle/user_projects/domains/domain1
   # If the domain home is in the image
@@ -129,10 +127,6 @@ spec:
   # 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
   # serverStartPolicy legal values are "NEVER", "ALWAYS", "IF_NEEDED", or "ADMIN_ONLY"
@@ -141,6 +135,12 @@ spec:
   # - "ADMIN_ONLY" will start up only the administration server (no managed servers will be started)
   # - "IF_NEEDED" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
   serverStartPolicy: "IF_NEEDED"
+  # an (optional) list of environment variable to be set on the servers
+  env:
+  - name: JAVA_OPTIONS
+    value: "-Dweblogic.StdoutDebugEnabled=false"
+  - name: USER_MEM_ARGS
+    value: "-Xms64m -Xmx256m "
   # adminServer is used to configure the desired behavior for starting the administration server.
   adminServer:
   # serverStartState legal values are "RUNNING" or "ADMIN"
@@ -152,37 +152,12 @@ spec:
     # Uncomment to export the T3Channel as a service
     # exportedNetworkAccessPoints:
     #   T3Channel: {}
-    # an (optional) list of environment variable to be set on the server
-    env:
-    - name: JAVA_OPTIONS
-      value: "-Dweblogic.StdoutDebugEnabled=false"
-    - name: USER_MEM_ARGS
-      value: "-Xms64m -Xmx256m "
-    volumes:
-    - name: runtime-properties
-      hostPath:
-        path: "/scratch/weblogic-kubernetes-operator/kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/docker-images/OracleWebLogic/samples/12213-domain-home-in-image/properties/docker_run"
-    volumeMounts:
-    - name: runtime-properties
-      mountPath: "/u01/oracle/properties"
   # 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"
       replicas: 2
-      env:
-      - name: JAVA_OPTIONS
-        value: "-Dweblogic.StdoutDebugEnabled=false"
-      - name: USER_MEM_ARGS
-        value: "-Xms64m -Xmx256m "
-      volumes:
-      - name: runtime-properties
-        hostPath:
-          path: "/scratch/weblogic-kubernetes-operator/kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/docker-images/OracleWebLogic/samples/12213-domain-home-in-image/properties/docker_run"
-      volumeMounts:
-      - name: runtime-properties
-        mountPath: "/u01/oracle/properties"
   # The number of managed servers to start for unlisted clusters
   # replicas: 1
 
@@ -204,92 +179,117 @@ Here is an example of the output of this command:
 $ kubectl describe domain domain1
 Name:         domain1
 Namespace:    default
-Labels:       weblogic.domainName=base_domain
-              weblogic.domainUID=domain1
+Labels:       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
+  Creation Timestamp:  2018-12-11T01:33:27Z
+  Generation:          1
+  Resource Version:    46624
+  Self Link:           /apis/weblogic.oracle/v2/namespaces/default/domains/domain1
+  UID:                 c1f7be60-fce4-11e8-bc6c-0021f6985fb7
 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:
+    Node Port Annotations:
+    Node Port Labels:
+    Server Pod:
+      Container Security Context:
+      Env:
+      Liveness Probe:
+      Node Selector:
+      Pod Annotations:
+      Pod Labels:
+      Pod Security Context:
+      Readiness Probe:
+      Resources:
+        Limits:
+        Requests:
+      Service Annotations:
+      Service Labels:
+      Volume Mounts:
+      Volumes:
+    Server Start State:  RUNNING
   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:
+        Service Annotations:
+        Service Labels:
+        Volume Mounts:
+        Volumes:
+      Server Start State:         RUNNING
+  Domain Home:                    /u01/oracle/user_projects/domains/domain1
+  Domain Home In Image:           true
+  Image:                          12213-domain-home-in-image:latest
+  Image Pull Policy:              Never
+  Include Server Out In Pod Log:  true
   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
-  Storage:
-    Predefined:
-      Claim:  domain1-weblogic-sample-pvc
+    Liveness Probe:
+    Node Selector:
+    Pod Annotations:
+    Pod Labels:
+    Pod Security Context:
+    Readiness Probe:
+    Resources:
+      Limits:
+      Requests:
+    Service Annotations:
+    Service Labels:
+    Volume Mounts:
+    Volumes:
+  Server Start Policy:  IF_NEEDED
 Status:
   Conditions:
-    Last Transition Time:  2018-10-31T13:01:34.786Z
+    Last Transition Time:  2018-12-11T01:35:23.652Z
     Reason:                ServersReady
     Status:                True
     Type:                  Available
   Servers:
     Health:
-      Activation Time:  2018-10-31T13:07:14.472Z
+      Activation Time:  2018-12-11T01:34:59.546Z
       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
+      Activation Time:  2018-12-11T01:36:46.132Z
       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
+      Activation Time:  2018-12-11T01:36:47.865Z
       Overall Health:   ok
       Subsystems:
-    Node Name:    xxxxxxxx
-    Server Name:  managed-server2
+    Node Name:     xxxxxxxx
+    Server Name:   managed-server2
     State:        RUNNING
-  Start Time:     2018-10-31T12:59:15.244Z
-Events:           <none>
+  Start Time:     2018-12-11T01:33:27.339Z
+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.