Merge pull request #146 from oracle/simon-meng-cn/100-fixes

Add persistent volume configuration to support NFS

Author: rjeberhard

kubernetes/create-domain-job-inputs.yaml

@@ -36,6 +36,13 @@ managedServerNameBase: managed-server
 # Port number for each managed server
 managedServerPort: 8001
 
+# Persistent volume type, the value must be hostPath or nfs.
+# If using nfs, nfsServer must be specified.
+persistenceType: hostPath
+
+# NFS server name or ip
+nfsServer: nfsServer
+
 # Physical path of the persistent volume storage
 persistencePath: /scratch/k8s_dir/persistentVolume001
 

kubernetes/create-domain-job.sh

@@ -86,7 +86,7 @@ function validatePersistentVolumeClaimName {
 #
 # Function to validate the persistent volume name
 #
-function validatePersistenVolumeName {
+function validatePersistentVolumeName {
   validateLowerCase ${persistenceVolumeName} "persistenceVolumeName"
 
   if [[ ${persistenceVolumeName} != ${domainUid}-* ]] ; then
@@ -96,6 +96,17 @@ function validatePersistenVolumeName {
   fi
 }
 
+#
+# Function to validate the persistence type
+#
+function validatePersistenceType {
+  if [ ${persistenceType} == "nfs" ] ; then
+    validateInputParamsSpecified nfsServer
+  elif [ ${persistenceType} != "hostPath" ] ; then
+    validationError "The persistenceType ${persistenceType} is invalid, it must be hostPath or nfs"
+  fi
+}
+
 #
 # Function to validate the secret name
 #
@@ -262,7 +273,8 @@ function initialize {
   validateDomainUid
   validateClusterName
   validateStorageClass
-  validatePersistenVolumeName
+  validatePersistenceType
+  validatePersistentVolumeName
   validatePersistentVolumeClaimName
   validateSecretName
   validateImagePullSecretName
@@ -283,12 +295,22 @@ function createYamlFiles {
   echo Generating ${pvOutput}
 
   cp ${pvInput} ${pvOutput}
+  if [ "${persistenceType}" == "nfs" ]; then
+    hostPathPrefix="${disabledPrefix}"
+    nfsPrefix="${enabledPrefix}"
+    sed -i -e "s:%NFS_SERVER%:${nfsServer}:g" ${pvOutput}
+  else
+    hostPathPrefix="${enabledPrefix}"
+    nfsPrefix="${disabledPrefix}"
+  fi
   sed -i -e "s:%DOMAIN_UID%:${domainUid}:g" ${pvOutput}
   sed -i -e "s:%NAMESPACE%:$namespace:g" ${pvOutput}
   sed -i -e "s:%PERSISTENT_VOLUME%:${persistenceVolumeName}:g" ${pvOutput}
   sed -i -e "s:%PERSISTENT_VOLUME_PATH%:${persistencePath}:g" ${pvOutput}
   sed -i -e "s:%PERSISTENT_VOLUME_SIZE%:${persistenceSize}:g" ${pvOutput}
   sed -i -e "s:%STORAGE_CLASS_NAME%:${persistenceStorageClass}:g" ${pvOutput}
+  sed -i -e "s:%HOST_PATH_PREFIX%:${hostPathPrefix}:g" ${pvOutput}
+  sed -i -e "s:%NFS_PREFIX%:${nfsPrefix}:g" ${pvOutput}
 
   # Generate the yaml to create the persistent volume claim
   echo Generating ${pvcOutput}

kubernetes/internal/persistent-volume-template.yaml

@@ -14,5 +14,7 @@ spec:
   accessModes:
     - ReadWriteMany
   persistentVolumeReclaimPolicy: Retain
-  hostPath:
+  %HOST_PATH_PREFIX%hostPath:
+  %NFS_PREFIX%nfs:
+    %NFS_PREFIX%server: %NFS_SERVER%
     path: "%PERSISTENT_VOLUME_PATH%"