Fix sample input defaults (#624)

* Have explicit default values in the input files

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

* Update README

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

* More update to the README

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

* Update one more property

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

Author: doxiao

kubernetes/samples/scripts/create-weblogic-domain/create-weblogic-credentials.sh

@@ -42,9 +42,9 @@ function usage {
   echo usage: ${script} -u username -p password [-d domainUID] [-n namespace] [-s sercretName] [-h]
   echo "  -u username, must be specified."
   echo "  -p password, must be specified."
-  echo "  -n namespace, optional. The value is default if not specified"
-  echo "  -d domainUID, optional. The default value is `domain1`. When specified, the secret will be label with the domainUID unless the given value is an empty string."
-  echo "  -s secretName, optional. When not specified, the secret name will be determined based on the domainUID option"
+  echo "  -d domainUID, optional. The default value is domain1. If specified, the secret will be labeled with the domainUID unless the given value is an empty string."
+  echo "  -n namespace, optional. Use the default namespace if not specified"
+  echo "  -s secretName, optional. If not specified, the secret name will be determined based on the domainUID value"
   echo "  -h Help"
   exit $1
 }

kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml

@@ -42,8 +42,8 @@ productionModeEnabled: true
 
 # Name of the Kubernetes secret for the Admin Server's username and password
 # The name must be lowercase. 
-# The default is <domainUID>-weblogic-credentials.
-weblogicCredentialsSecretName:
+# If not specified, the value is derived from the domainUID as <domainUID>-weblogic-credentials
+weblogicCredentialsSecretName: domain1-weblogic-credentials
 
 # Whether to include server .out to the pod's stdout.
 # The default is true.

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

@@ -73,7 +73,7 @@ The following parameters can be provided in the inputs file.
 | `createDomainFilesDir` | Directory to get all the create domain scripts and supporting files, including the script that is specified by the `createDomainScriptName` property. By default, this directory is set to the relative path `wlst`, and the create script will use the built-in WLST offline scripts in the `wlst` directory to create the WebLogic domain. It can also be set to the relative path `wdt`, and then the built-in WDT scripts will be used instead. An absolute path is also supported to point to an arbitrary directory in the file system. | `wlst` |
 | `createDomainScriptsMountPath` | Mount path of the directory where the create domain scripts are located inside the pod. | `/u01/weblogic` |
 | `createDomainScriptName` | Script that creates the domain. | `create-domain-job.sh` |
-| `domainHome` | Home directory of the WebLogic domain. | `/shared/domains/<domainUID>` |
+| `domainHome` | Home directory of the WebLogic domain. If not specified, the value is derived from the `domainUID` as `/shared/domains/<domainUID>`. | `/shared/domains/domain1` |
 | `domainPVMountPath` | Mount path of the domain persistent volume. | `/shared` |
 | `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` |
@@ -84,15 +84,16 @@ The following parameters can be provided in the inputs file.
 | `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` |
-| `logHome` | The in-pod name of the directory to store the domain, node manager, server logs, and server .out files in. | `/shared/logs/<domainUID>` |
+| `logHome` | The in-pod name of the directory to store the domain, node manager, server logs, and server .out files in. If not specified, the value is derived from the `domainUID` as `/shared/logs/<domainUID>`. | `/shared/logs/domain1` |
 | `managedServerNameBase` | Base string used to generate Managed Server names. | `managed-server` |
 | `managedServerPort` | Port number for each Managed Server. | `8001` |
 | `namespace` | Kubernetes namespace in which to create the domain. | `default` |
+| `persistentVolumeClaimName` | Name of the persistent volume claim. If not specified, the value is derived from the `domainUID` as `<domainUID>-weblogic-sample-pvc` | `domain1-weblogic-sample-pvc` |
 | `productionModeEnabled` | Boolean indicating if production mode is enabled for the domain. | `true` |
 | `serverStartPolicy` | Determines which WebLogic Servers will be started up. Legal values are `NEVER`, `ALWAYS`, `IF_NEEDED`, `ADMIN_ONLY`. | `IF_NEEDED` |
 | `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` |
+| `weblogicCredentialsSecretName` | Name of the Kubernetes secret for the Administration Server's username and password. If not specified, the value is derived from the `domainUID` as `<domainUID>-weblogic-credentials`. | `domain1-weblogic-credentials` |
 | `weblogicImagePullSecretName` | Name of the Kubernetes secret for the Docker Store, used to pull the WebLogic Server image. | `docker-store-secret` |
 
 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 `("-")`.

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

@@ -15,8 +15,8 @@ adminServerName: admin-server
 domainUID: domain1
 
 # Home of the WebLogic domain
-# The default is /shared/domains/<domainUID>
-domainHome: 
+# If not specified, the value is derived from the domainUID as /shared/domains/<domainUID>
+domainHome: /shared/domains/domain1
 
 # Type of WebLogic Cluster
 # Legal values are "CONFIGURED" or "DYNAMIC" 
@@ -57,17 +57,17 @@ productionModeEnabled: true
 
 # Name of the Kubernetes secret for the Admin Server's username and password
 # The name must be lowercase. 
-# The default is <domainUID>-weblogic-credentials.
-weblogicCredentialsSecretName: 
+# If not specified, the value is derived from the domainUID as <domainUID>-weblogic-credentials
+weblogicCredentialsSecretName: domain1-weblogic-credentials
 
 # Whether to include server .out to the pod's stdout. 
 # The 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.
-# The default is /shared/logs/<domainUID>/.
-logHome:
+# If not specified, the value is derived from the domainUID as /shared/logs/<domainUID>
+logHome: /shared/logs/domain1
 
 # Port for the T3Channel of the NetworkAccessPoint
 t3ChannelPort: 30012
@@ -94,8 +94,8 @@ namespace: default
 javaOptions: -Dweblogic.StdoutDebugEnabled=false
 
 # Name of the persistent volume claim 
-# The default is <domainUID>-weblogic-sample-pvc
-persistentVolumeClaimName: 
+# If not specified, the value is derived from the domainUID as <domainUID>-weblogic-sample-pvc
+persistentVolumeClaimName: domain1-weblogic-sample-pvc 
 
 # Mount path of the domain persistent volume. 
 domainPVMountPath: /shared