Remove clusterType from create domain samples

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

Author: doxiao

kubernetes/samples/scripts/common/validate.sh

@@ -231,24 +231,6 @@ function validateServerStartPolicy {
   fi
 }
 
-#
-# Function to validate the cluster type value
-#
-function validateClusterType {
-  validateInputParamsSpecified clusterType
-  if [ ! -z "${clusterType}" ]; then
-    case ${clusterType} in
-      "CONFIGURED")
-      ;;
-      "DYNAMIC")
-      ;;
-      *)
-        validationError "Invalid value for clusterType: ${clusterType}. Valid values are 'CONFIGURED' and 'DYNAMIC'."
-      ;;
-    esac
-  fi
-}
-
 #
 # Function to validate the weblogic domain storage reclaim policy
 #
@@ -388,7 +370,6 @@ function validateCommonInputs {
   validateClusterName
   validateWeblogicCredentialsSecretName
   validateServerStartPolicy
-  validateClusterType
   validateWeblogicImagePullPolicy
   validateWeblogicImagePullSecretName
 

kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/properties-template.properties

@@ -11,7 +11,7 @@ DB_PORT=1527
 DEBUG_FLAG=true
 DERBY_FLAG=true
 PRODUCTION_MODE_ENABLED=%PRODUCTION_MODE_ENABLED%
-CLUSTER_TYPE=%CLUSTER_TYPE%
+CLUSTER_TYPE=DYNAMIC
 JAVA_OPTIONS=%JAVA_OPTIONS%
 T3_CHANNEL_PORT=%T3_CHANNEL_PORT%
 T3_PUBLIC_ADDRESS=%T3_PUBLIC_ADDRESS%

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-job-template.yaml

@@ -44,7 +44,7 @@ spec:
             - name: CLUSTER_NAME
               value: "%CLUSTER_NAME%"
             - name: CLUSTER_TYPE
-              value: "%CLUSTER_TYPE%"
+              value: "DYNAMIC"
             - name: T3_CHANNEL_PORT
               value: "%T3_CHANNEL_PORT%"
             - name: T3_PUBLIC_ADDRESS

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

@@ -227,7 +227,6 @@ function createFiles {
   sed -i -e "s:%T3_CHANNEL_PORT%:${t3ChannelPort}:g" ${createJobOutput}
   sed -i -e "s:%T3_PUBLIC_ADDRESS%:${t3PublicAddress}:g" ${createJobOutput}
   sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${createJobOutput}
-  sed -i -e "s:%CLUSTER_TYPE%:${clusterType}:g" ${createJobOutput}
   sed -i -e "s:%DOMAIN_PVC_NAME%:${persistentVolumeClaimName}:g" ${createJobOutput}
   sed -i -e "s:%DOMAIN_ROOT_DIR%:${domainPVMountPath}:g" ${createJobOutput}
   sed -i -e "s:%CREATE_DOMAIN_SCRIPT_DIR%:${createDomainScriptsMountPath}:g" ${createJobOutput}
@@ -313,7 +312,7 @@ function createDomainConfigmap {
   echo domainName: $domainName >> ${externalFilesTmpDir}/create-domain-inputs.yaml
 
   if [ -f ${externalFilesTmpDir}/prepare.sh ]; then
-   sh ${externalFilesTmpDir}/prepare.sh -t ${clusterType} -i ${externalFilesTmpDir}
+   sh ${externalFilesTmpDir}/prepare.sh -i ${externalFilesTmpDir}
   fi
 
   # create the configmap and label it properly

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

@@ -6,34 +6,25 @@
 # Perform preparation based on the specified cluster type
 
 function usage {
-  echo usage: ${script} -t clusterTpe -i file [-h]
+  echo usage: ${script} -i file [-h]
   echo "  -i Directory, must be specified."
-  echo "  -t Cluster type, CONFIGURED or DYNAMIC, default is DYNAMIC."
   echo "  -h Help"
   exit $1
 }
 
 
-while getopts "hi:t:" opt; do
+while getopts "hi:" opt; do
   case $opt in
     i) externalFilesTmpDir="${OPTARG}"
     ;;
-    t) clusterType="${OPTARG}"
-    ;;
     h) usage 0
     ;;
     *) usage 1
     ;;
   esac
 done
 
-echo Preparing the scripts with clusterType $clusterType
-
-if [ "${clusterType}" = "CONFIGURED" ]; then
-  source_model=${externalFilesTmpDir}/wdt_model_configured.yaml
-else
-  source_model=${externalFilesTmpDir}/wdt_model_dynamic.yaml
-fi
+echo Preparing the model script
 
-cp $source_model ${externalFilesTmpDir}/wdt_model.yaml
+cp ${externalFilesTmpDir}/wdt_model_dynamic.yaml ${externalFilesTmpDir}/wdt_model.yaml