Merge pull request #47 from oracle/issue-42

provide option in create domain script to remove any pre-existing data in PV

Author: rjeberhard

kubernetes/create-domain-job-inputs.yaml

@@ -52,6 +52,10 @@ persistenceVolumeClaimName: pv001-claim
 # if it is not already
 persistenceVolumeName: pv001
 
+# Boolean indiciating whether to erase/overwrite an existing data found in the persistent volume
+# WARNING: if you set this to true, then ALL data found in the persistent volume will be deleted! 
+replaceExistingDomain: false
+
 # Boolean indicating if production mode is enabled for the domain
 productionModeEnabled: true
 

kubernetes/create-domain-job.sh

@@ -273,7 +273,7 @@ function initialize {
   validateInputParamsSpecified adminPort adminServerName createDomainScript domainName domainUid clusterName managedServerCount managedServerStartCount managedServerNameBase
   validateInputParamsSpecified managedServerPort persistencePath persistenceSize persistenceVolumeClaimName persistenceVolumeName
   validateInputParamsSpecified productionModeEnabled secretsMountPath secretName t3ChannelPort exposeAdminT3Channel adminNodePort exposeAdminNodePort
-  validateInputParamsSpecified namespace loadBalancer loadBalancerWebPort loadBalancerAdminPort loadBalancer
+  validateInputParamsSpecified namespace loadBalancer loadBalancerWebPort loadBalancerAdminPort loadBalancer replaceExistingDomain
   validateStorageClass
   validateLoadBalancer
   validateImagePullSecretName
@@ -349,6 +349,7 @@ function createYamlFiles {
   sed -i -e "s:%T3_CHANNEL_PORT%:${t3ChannelPort}:g" ${jobOutput}
   sed -i -e "s:%T3_PUBLIC_ADDRESS%:${t3PublicAddress}:g" ${jobOutput}
   sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${jobOutput}
+  sed -i -e "s:%REPLACE_EXISTING_DOMAIN%:${replaceExistingDomain}:g" ${jobOutput}
 
   # Generate the yaml to create the domain custom resource
   echo Generating ${dcrOutput}

kubernetes/internal/domain-job-template.yaml

@@ -60,10 +60,16 @@ data:
       fail "The domain secret %SECRETS_MOUNT_PATH%/password was not found"
     fi
 
-    # Do not proceed if the domain already exists
+    # Check if the domain already exists
     domainFolder=${SHARED_PATH}/domain/%DOMAIN_NAME%
     if [ -d ${domainFolder} ]; then
-      fail "The create domain job will not overwrite an existing domain. The domain folder ${domainFolder} already exists"
+      # check if user asked to replace existing data
+      if [ "%REPLACE_EXISTING_DOMAIN%" = "true" ]; then
+        echo "As requested, deleting all data in the peristent volume to make way for new domain!"
+        rm -rf ${SHARED_PATH}/*
+      else
+        fail "The create domain job will not overwrite an existing domain unless you set the parameter 'replaceExistingDomain' to 'true'. The domain folder ${domainFolder} already exists"
+      fi
     fi
 
     # Create the base folders
@@ -177,8 +183,8 @@ data:
     sleep 15
     echo "Finished waiting for the nodemanager to start"
 
-    echo "Update JVM arguments" 
-    echo "Arguments=\${USER_MEM_ARGS} -XX\:+UnlockExperimentalVMOptions -XX\:+UseCGroupMemoryLimitForHeap \${JAVA_OPTIONS}" >> ${startProp} 
+    echo "Update JVM arguments"
+    echo "Arguments=\${USER_MEM_ARGS} -XX\:+UnlockExperimentalVMOptions -XX\:+UseCGroupMemoryLimitForHeap \${JAVA_OPTIONS}" >> ${startProp}
 
     echo "Start the server"
     wlst.sh -skipWLSModuleScanning ${pyFile}
@@ -207,7 +213,7 @@ data:
       checkFileExists ${pyFile}
 
       # Create a liveness probe script. It checks a WL server state file maintained by the node manager.
-      # The script and 'EOF' on the following lines must not be indented! 
+      # The script and 'EOF' on the following lines must not be indented!
 
       scriptFile=${nmdir}/livenessProbe.sh
 
@@ -317,7 +323,7 @@ data:
     done
 
     echo "Successfully Completed"
-    
+
   create-domain.py: |-
     # This python script is used to create a WebLogic domain
 

site/creating-domain.md

@@ -106,6 +106,7 @@ The following parameters must be provided in the input file:
 | persistenceStorageClass	| Name of the storage class to set for the persistent volume and persistent volume claim.	| weblogic |
 | persistenceVolumeClaimName	| Name of the Kubernetes persistent volume claim for this domain.	| pv001-claim |
 | persistenceVolumeName	| Name of the Kubernetes persistent volume for this domain.	| pv001 |
+| replaceExistingDomain | If set to 'true' the script will remove any data it finds in the persistent volume before creating the new domain.  Use with caution. | false |
 | productionModeEnabled	| Boolean indicating if production mode is enabled for the domain. | true |
 | secretsMountPath |	Path for mounting secrets.  This parameter should not be modified. |	/var/run/secrets-domain1 |
 | secretName	| Name of the Kubernetes secret for the Administration Server's username and password. |	domain1-weblogic-credentials |