Merge branch 'master' into better-status

Author: rjeberhard

kubernetes/create-weblogic-domain-inputs.yaml

@@ -46,6 +46,10 @@ weblogicDomainStorageType: HOST_PATH
 # The following line must be uncomment and customized:
 #weblogicDomainStoragePath: /scratch/k8s_dir/domain1
 
+# Reclaim policy of the domain's persistent storage
+# The valid values are: 'Retain', 'Delete', and 'Recycle'
+weblogicDomainStorageReclaimPolicy: Retain
+
 # Total storage allocated to the domain's persistent storage.
 weblogicDomainStorageSize: 10Gi
 

kubernetes/create-weblogic-domain.sh

@@ -15,7 +15,7 @@
 #
 
 script="${BASH_SOURCE[0]}"
-scriptDir="$( cd "$( dirname "${script}" )" && pwd )"
+scriptDir="$( cd "$(dirname "${script}")" > /dev/null 2>&1 ; pwd -P)"
 internalDir="${scriptDir}/internal"
 
 # This is the script that the customers use to create a domain.

kubernetes/create-weblogic-operator.sh

@@ -3,7 +3,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 script="${BASH_SOURCE[0]}"
-scriptDir="$( cd "$( dirname "${script}" )" && pwd )"
+scriptDir="$( cd "$(dirname "${script}")" > /dev/null 2>&1 ; pwd -P)"
 internalDir="${scriptDir}/internal"
 
 # This is the script that the customers use to create an operator.

kubernetes/internal/create-weblogic-domain.sh

@@ -124,6 +124,29 @@ function validateClusterName {
   clusterNameLC=$(toLower $clusterName)
 }
 
+#
+# Function to validate the weblogic domain storage reclaim policy
+#
+function validateWeblogicDomainStorageReclaimPolicy {
+  validateInputParamsSpecified weblogicDomainStorageReclaimPolicy
+  if [ ! -z "${weblogicDomainStorageReclaimPolicy}" ]; then
+    case ${weblogicDomainStorageReclaimPolicy} in
+      "Retain")
+      ;;
+      "Delete")
+        if [ "${weblogicDomainStoragePath:0:5}" != "/tmp/" ]; then
+          validationError "ERROR - Invalid value for weblogicDomainStorageReclaimPolicy ${weblogicDomainStorageReclaimPolicy} with weblogicDomainStoragePath ${weblogicDomainStoragePath} that is not /tmp/"
+        fi
+      ;;
+      "Recycle")
+      ;;
+      *)
+        validationError "Invalid value for weblogicDomainStorageReclaimPolicy: ${weblogicDomainStorageReclaimPolicy}. Valid values are Retain, Delete and Recycle."
+      ;;
+    esac
+  fi
+}
+
 #
 # Function to validate the weblogic domain storage type
 #
@@ -333,6 +356,7 @@ function initialize {
   validateNamespace
   validateClusterName
   validateWeblogicDomainStorageType
+  validateWeblogicDomainStorageReclaimPolicy
   validateWeblogicCredentialsSecretName
   validateWeblogicImagePullSecretName
   validateLoadBalancer
@@ -383,6 +407,7 @@ function createYamlFiles {
   sed -i -e "s:%DOMAIN_UID%:${domainUID}:g" ${domainPVOutput}
   sed -i -e "s:%NAMESPACE%:$namespace:g" ${domainPVOutput}
   sed -i -e "s:%WEBLOGIC_DOMAIN_STORAGE_PATH%:${weblogicDomainStoragePath}:g" ${domainPVOutput}
+  sed -i -e "s:%WEBLOGIC_DOMAIN_STORAGE_RECLAIM_POLICY%:${weblogicDomainStorageReclaimPolicy}:g" ${domainPVOutput}
   sed -i -e "s:%WEBLOGIC_DOMAIN_STORAGE_SIZE%:${weblogicDomainStorageSize}:g" ${domainPVOutput}
   sed -i -e "s:%HOST_PATH_PREFIX%:${hostPathPrefix}:g" ${domainPVOutput}
   sed -i -e "s:%NFS_PREFIX%:${nfsPrefix}:g" ${domainPVOutput}

kubernetes/internal/weblogic-domain-persistent-volume-template.yaml

@@ -13,7 +13,8 @@ spec:
     storage: %WEBLOGIC_DOMAIN_STORAGE_SIZE%
   accessModes:
     - ReadWriteMany
-  persistentVolumeReclaimPolicy: Retain
+  # Valid values are Retain, Delete or Recycle
+  persistentVolumeReclaimPolicy: %WEBLOGIC_DOMAIN_STORAGE_RECLAIM_POLICY%
   %HOST_PATH_PREFIX%hostPath:
   %NFS_PREFIX%nfs:
     %NFS_PREFIX%server: %WEBLOGIC_DOMAIN_STORAGE_NFS_SERVER%

site/creating-domain.md

@@ -120,6 +120,7 @@ The following parameters must be provided in the input file:
 | 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 |
 | weblogicDomainStoragePath | Physical path of the storage for the domain. | no default |
+| weblogicDomainStorageReclaimPolicy | Kubernetes persistent volume reclaim policy for the domain persistent storage | Retain |
 | weblogicDomainStorageSize | Total storage allocated for the domain. | 10Gi |
 | weblogicDomainStorageType | Type of storage for the domain. Legal values are 'NFS' and 'HOST_PATH". | HOST_PATH |
 | weblogicDomainStorageNFSServer| The name of IP address of the NFS server for the domain's storage. | no default |

site/name-changes.md

@@ -50,11 +50,11 @@ Similarly, the per-domain directory name is:
 
 #### What If I Mess Up Creating a Domain or Operator And Want To Do It Again?
 
+* Remove the resources that were created for the domain:
+  * kubernetes/delete-weblogic-domain-resources.sh yourDomainUID
 * Remove the resources that were created for the operator:
   * kubectl delete -f weblogic-operator.yaml
   * kubectl delete -f weblogic-operator-security.yaml
-* Remove the resources that were created for the domain:
-  * kubernetes/delete-weblogic-domain-resources.sh yourDomainUID
 * either remove the directory that was generated for that operator / domain, or remove the generated YAML files and the copy of the input file from it
 * make whatever changes you need in your inputs file
 * re-run the create script

src/integration-tests/bash/cleanup.sh

@@ -51,6 +51,7 @@ OCOUNT=${#OPER_NAMESPACES[@]}
 SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
 PROJECT_ROOT="$SCRIPTPATH/../../.."
 RESULT_ROOT=${RESULT_ROOT:-/scratch/$USER/wl_k8s_test_results}
+PV_ROOT=${PV_ROOT:-$RESULT_ROOT}
 RESULT_DIR="$RESULT_ROOT/acceptance_test_tmp"
 USER_PROJECTS_DIR="$RESULT_DIR/user-projects"
 TMP_DIR="$RESULT_DIR/cleanup_tmp"