Fine tuning create domain and credentials samples

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

Author: doxiao

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

@@ -8,6 +8,18 @@
 #  The following pre-requisites must be handled prior to running this script:
 #    * The kubernetes namespace must already be created
 #
+# Secret name determination
+#  1) secretName - if specified
+#  2) domain1-weblogic-credentials - if secretName and domainUID are both not specified. This is the default out-of-the-box.
+#  3) <domainUID>-weblogic-credentials - if secretName is not specified, and domainUID is specified.
+#  4) <domainUID>-weblogic-credentials - if secretName is not specified, and domainUID is specified as "".
+#
+# The generated secret will be labeled with 
+#       weblogic.domainUID=$domainUID 
+# and
+#       weblogic.domainName=$domainUID 
+# Where the $domainUID is the value of the -d command line option, unless the value supplied is an empty String ""
+#
 
 script="${BASH_SOURCE[0]}"
 
@@ -27,11 +39,12 @@ function validateKubectlAvailable {
 }
 
 function usage {
-  echo usage: ${script} -u username -p password [-d domainUID] [-n namespace] [-h]
+  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."
-  echo "  -d domainUID, optional."
+  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 "  -h Help"
   exit $1
 }
@@ -41,7 +54,7 @@ function usage {
 #
 domainUID=domain1
 namespace=default
-while getopts "hu:p:n:d:" opt; do
+while getopts "hu:p:n:d:s:" opt; do
   case $opt in
     u) username="${OPTARG}"
     ;;
@@ -51,13 +64,22 @@ while getopts "hu:p:n:d:" opt; do
     ;;
     d) domainUID="${OPTARG}"
     ;;
+    s) secretName="${OPTARG}"
+    ;;
     h) usage 0
     ;;
     *) usage 1
     ;;
   esac
 done
-secretName=$domainUID-weblogic-credentials
+
+if [ -z $secretName ]; then
+  if [ -z $domainUID ]; then
+    secretName=weblogic-credentials
+  else 
+    secretName=$domainUID-weblogic-credentials
+  fi
+fi
 
 if [ -z ${username} ]; then
   echo "${script}: -u must be specified."
@@ -84,13 +106,15 @@ kubectl -n $namespace create secret generic $secretName \
   --from-literal=username=$username \
   --from-literal=password=$password
 
-# label the secret with domainUID
-kubectl label secret ${secretName} -n $namespace weblogic.domainUID=$domainUID weblogic.domainName=$domainUID
+# label the secret with domainUID if needed
+if [ ! -z $domainUID ]; then
+  kubectl label secret ${secretName} -n $namespace weblogic.domainUID=$domainUID weblogic.domainName=$domainUID
+fi
 
 # Verify the secret exists
 SECRET=`kubectl get secret ${secretName} -n ${namespace} | grep ${secretName} | wc | awk ' { print $1; }'`
 if [ "${SECRET}" != "1" ]; then
   fail "The secret ${secretName} was not found in namespace ${namespace}"
 fi
 
-echo "The secret ${secretName} has been successfully created in namespace ${namespace}"
+echo "The secret ${secretName} has been successfully created in the ${namespace} namespace."

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

@@ -22,7 +22,7 @@ Make a copy of the `create-domain-inputs.yaml` file, and run the create script,
 
 The script will perform the following steps:
 
-* Create a directory for the generated Kubernetes YAML files for this domain.  The pathname is `/path/to/weblogic-operator-output-directory/weblogic-domains/<domainUID>`.
+* 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 custom resource YAML file, `domain-custom-resource.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.

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

@@ -296,7 +296,7 @@ function createYamlFiles {
   fi
 
   if [ -z "${logHome}" ]; then
-    logHome="/shared/logs/${domainUID}"
+    logHome="${domainPVMountPath}/logs/${domainUID}"
   fi
 
   # Use the default value if not defined.
@@ -406,7 +406,7 @@ function createYamlFiles {
 }
 
 # create domain configmap using what is in the createDomainFilesDir
-function create_domain_configmap {
+function createDomainConfigmap {
   # Use the default files if createDomainFilesDir is not specified
   if [ -z "${createDomainFilesDir}" ]; then
     createDomainFilesDir=${scriptDir}/wlst
@@ -447,13 +447,21 @@ function create_domain_configmap {
   rm -rf $externalFilesTmpDir
 }
 
+#
+# Function to delete the create domain job config map and fail
+#
+function cleanupAndFail {
+  deleteDomainConfigmap
+  fail $1
+}
+
 #
 # Function to run the job that creates the domain
 #
 function createDomainHome {
 
   # create the config map for the job
-  create_domain_configmap
+  createDomainConfigmap
 
   # There is no way to re-run a kubernetes job, so first delete any prior job
   JOB_NAME="${domainUID}-create-weblogic-sample-domain-job"
@@ -482,7 +490,7 @@ function createDomainHome {
         echo A failure was detected in the log file for job $JOB_NAME
         echo $JOB_ERRORS
         echo Check the log output for additional information
-        fail "Exiting due to failure - the job has failed"
+        cleanupAndFail "Exiting due to failure - the job has failed"
       fi
     fi
   done
@@ -493,7 +501,7 @@ function createDomainHome {
     echo The create domain job is not showing status completed after waiting 300 seconds
     echo Check the log output for errors
     kubectl logs jobs/$JOB_NAME -n ${namespace}
-    fail "Exiting due to failure - the job status is not Completed!"
+    cleanupAndFail "Exiting due to failure - the job status is not Completed!"
   fi
 
   # Check for successful completion in log file
@@ -502,11 +510,22 @@ function createDomainHome {
     echo The log file for the create domain job does not contain a successful completion status
     echo Check the log output for errors
     kubectl logs $JOB_POD -n ${namespace}
-    fail "Exiting due to failure - the job log file does not contain a successful completion status!"
+    cleanupAndFail "Exiting due to failure - the job log file does not contain a successful completion status!"
   fi
 
+  # Delete the configmap for the create domain job
+  deleteDomainConfigmap
+
 }
 
+#
+# Function to delete the config map used by the job
+#
+function deleteDomainConfigmap {
+  # delete the configmap
+  local cmName=${domainUID}-create-weblogic-sample-domain-job-cm
+  kubectl delete configmap ${cmName} -n $namespace
+}
 
 #
 # Function to output to the console a summary of the work completed