Minor fix to default pvc

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

Author: doxiao

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
-# By default, this is set to /shared/domains/domainUID
-domainHome: /shared/domains/domain1
+# The default is /shared/domains/<domainUID>
+domainHome: 
 
 # Type of WebLogic Cluster
 # Legal values are "CONFIGURED" or "DYNAMIC" 
@@ -56,16 +56,17 @@ imagePullPolicy: IfNotPresent
 productionModeEnabled: true
 
 # Name of the Kubernetes secret for the Admin Server's username and password
-# The name must be lowercase
-weblogicCredentialsSecretName: domain1-weblogic-credentials
+# The name must be lowercase. 
+# The default is <domainUID>-weblogic-credentials.
+weblogicCredentialsSecretName: 
 
-# Whether to include server .out to the pod's stdout, default is true
+# 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.
-# 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>/.
+# The default is /shared/logs/<domainUID>/.
 logHome:
 
 # Port for the T3Channel of the NetworkAccessPoint
@@ -93,7 +94,8 @@ namespace: default
 javaOptions: -Dweblogic.StdoutDebugEnabled=false
 
 # Name of the persistent volume claim 
-persistentVolumeClaimName: weblogic-sample-pvc
+# The default is <domainUID>-weblogic-sample-pvc
+persistentVolumeClaimName: 
 
 # Mount path of the domain persistent volume. 
 domainPVMountPath: /shared

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

@@ -231,7 +231,6 @@ function initialize {
     domainUID \
     clusterName \
     managedServerNameBase \
-    weblogicCredentialsSecretName \
     namespace \
     t3PublicAddress \
     includeServerOutInPodLog \
@@ -295,10 +294,18 @@ function createYamlFiles {
     domainPVMountPath="/shared"
   fi
 
+  if [ -z "${domainHome}" ]; then
+    domainHome="${domainPVMountPath}/domains/${domainUID}"
+  fi
+
   if [ -z "${logHome}" ]; then
     logHome="${domainPVMountPath}/logs/${domainUID}"
   fi
 
+  if [ -z "${weblogicCredentialsSecretName}" ]; then
+    weblogicCredentialsSecretName="${domainUID}-weblogic-credentials"
+  fi
+
   # Use the default value if not defined.
   if [ -z "${createDomainScriptsMountPath}" ]; then
     createDomainScriptsMountPath="/u01/weblogic"
@@ -311,7 +318,7 @@ function createYamlFiles {
 
   # Use the default value if not defined.
   if [ -z "${persistentVolumeClaimName}" ]; then
-    persistentVolumeClaimName=weblogic-sample-domain-pvc
+    persistentVolumeClaimName=${domainUID}-weblogic-sample-pvc
   fi
 
   # Must escape the ':' value in image for sed to properly parse and replace