@@ -16,6 +16,7 @@ INTROSPECTCM_MERGED_MODEL="/weblogic-operator/introspectormii/merged_model.json"
1616INTROSPECTCM_WLS_VERSION=" /weblogic-operator/introspectormii/wls.version"
1717INTROSPECTCM_JDK_PATH=" /weblogic-operator/introspectormii/jdk.path"
1818INTROSPECTCM_SECRETS_AND_ENV_MD5=" /weblogic-operator/introspectormii/secrets_and_env.md5"
19+ INTROSPECTCM_DOMAIN_WDT_VERSION=" /weblogic-operator/introspectormii/domain_wdt_version"
1920PRIMORDIAL_DOMAIN_ZIPPED=" /weblogic-operator/introspectormii/primordial_domainzip.secure"
2021WLSDOMAIN_CONFIG_ZIPPED=" /weblogic-operator/introspectormii//domainzip.secure"
2122INTROSPECTJOB_IMAGE_MD5=" /tmp/inventory_image.md5"
@@ -442,6 +443,9 @@ checkWDTVersion() {
442443 exitOrLoop
443444 fi
444445
446+ if versionGE ${WDT_VERSION} " 4.0.0" ; then
447+ echo " ${WDT_VERSION} " > /tmp/domain_wdt_version
448+ fi
445449 trace " Exiting checkWDTVersion"
446450}
447451
@@ -505,7 +509,7 @@ createModelDomain() {
505509 trace " Using newly created domain"
506510 elif [ -f ${PRIMORDIAL_DOMAIN_ZIPPED} ] ; then
507511 trace " Using existing primordial domain"
508- cd / && base64 -d ${PRIMORDIAL_DOMAIN_ZIPPED} > ${LOCAL_PRIM_DOMAIN_ZIP} && tar -pxzf ${LOCAL_PRIM_DOMAIN_ZIP}
512+ restoreIntrospectorPrimordialDomain || return 1
509513 # create empty lib since we don't archive it in primordial zip and WDT will fail without it
510514 createFolder " ${DOMAIN_HOME} /lib" " This is the './lib' directory within directory 'domain.spec.domainHome'." || exitOrLoop
511515 # Since the SerializedSystem ini is encrypted, restore it first
@@ -536,6 +540,13 @@ restorePrimordialDomain() {
536540 restoreEncodedTar " primordial_domainzip.secure" || return 1
537541}
538542
543+ restoreIntrospectorPrimordialDomain () {
544+ cd / || return 1
545+ cat $( ls /weblogic-operator/introspectormii* /primordial_domainzip.secure | sort -t- -k3) > /tmp/domain.secure || return 1
546+ base64 -d " /tmp/domain.secure" > $LOCAL_PRIM_DOMAIN_ZIP || return 1
547+ tar -pxzf $LOCAL_PRIM_DOMAIN_ZIP || return 1
548+ }
549+
539550# Restores the specified directory, targz'ed and stored in one or more config maps after base 64 encoding
540551# args:
541552# $1 the name of the encoded file in the config map
@@ -643,7 +654,9 @@ createPrimordialDomain() {
643654 trace " Entering createPrimordialDomain"
644655 local create_primordial_tgz=0
645656 local recreate_domain=0
646- if [ -f ${PRIMORDIAL_DOMAIN_ZIPPED} ] ; then
657+
658+
659+ if [ -f ${PRIMORDIAL_DOMAIN_ZIPPED} ] ; then
647660 # If there is an existing domain in the cm - this is update in the lifecycle
648661 # Call WDT validateModel.sh to generate the new merged mdoel
649662 trace " Checking if security info has been changed"
@@ -672,6 +685,14 @@ createPrimordialDomain() {
672685 diff_model_v1 ${NEW_MERGED_MODEL} ${DECRYPTED_MERGED_MODEL}
673686 fi
674687
688+ if versionGE ${WDT_VERSION} " 4.0.0" ; then
689+ # If this is WDT 4.0 or newer and there is an existing primordial domain and no domain version
690+ # then it is created from WDT 3.x, force recreate of the domain
691+ if [ -f ${PRIMORDIAL_DOMAIN_ZIPPED} ] && [ ! -f ${INTROSPECTCM_DOMAIN_WDT_VERSION} ] ; then
692+ recreate_domain=1
693+ fi
694+ fi
695+
675696 if [ " ${MERGED_MODEL_ENVVARS_SAME} " == " false" ; then
676697
677698 diff_rc=$( cat /tmp/model_diff_rc)
@@ -1268,8 +1289,8 @@ encrypt_decrypt_domain_secret() {
12681289 trace " Exiting encrypt_decrypt_domain_secret"
12691290}
12701291
1271- # prepare mii server
1272- restorAppAndLibs () {
1292+ # restore App Libs and others from the archive
1293+ restoreAppAndLibs () {
12731294
12741295 createFolder " ${DOMAIN_HOME} /lib" " This is the './lib' directory within DOMAIN_HOME directory 'domain.spec.domainHome'." || return 1
12751296 local WLSDEPLOY_DOMAINLIB=" wlsdeploy/domainLibraries"
@@ -1308,6 +1329,16 @@ restorAppAndLibs() {
13081329 trace SEVERE " Domain Source Type is FromModel, error in extracting application archive ${IMG_ARCHIVES_ROOTDIR} /${file} "
13091330 return 1
13101331 fi
1332+
1333+ if versionGE ${WDT_VERSION} " 4.0.0" ; then
1334+ trace INFO " Newer version of WDT 4.0.0 - check if there is old archive format of these files"
1335+ if [ -d ${DOMAIN_HOME} /wlsdeploy/custom ] ; then
1336+ # copy to under DOMAIN_HOME/config
1337+ mkdir -p ${DOMAIN_HOME} /config/wlsdeploy/custom
1338+ cp -R ${DOMAIN_HOME} /wlsdeploy/custom/* ${DOMAIN_HOME} /config/wlsdeploy/custom
1339+ fi
1340+
1341+ fi
13111342 done
13121343
13131344}
@@ -1318,6 +1349,10 @@ restoreZippedDbWallets() {
13181349 if [ " $count " -gt 0 ] ; then
13191350 find ${DOMAIN_HOME} /wlsdeploy/dbWallets/* /* .zip -type f | xargs -I % sh -c ' unzip -jo % -d $(dirname %) ; rm %'
13201351 fi
1352+ count=$( find ${DOMAIN_HOME} /config/wlsdeploy/dbWallets/* /* .zip -type f 2> /dev/null | wc -l)
1353+ if [ " $count " -gt 0 ] ; then
1354+ find ${DOMAIN_HOME} /config/wlsdeploy/dbWallets/* /* .zip -type f | xargs -I % sh -c ' unzip -jo % -d $(dirname %) ; rm %'
1355+ fi
13211356}
13221357
13231358
@@ -1358,7 +1393,7 @@ prepareMIIServer() {
13581393 # during introspection, it will overwrite the tokenized version in the archive.
13591394
13601395 trace " Model-in-Image: Restoring apps and libraries"
1361- restorAppAndLibs || return 1
1396+ restoreAppAndLibs || return 1
13621397
13631398 trace " Model-in-Image: Restore domain config"
13641399 restoreDomainConfig || return 1
@@ -1378,14 +1413,19 @@ logSevereAndExit() {
13781413 exitOrLoop
13791414}
13801415
1381- # Function to expand the WDT custom folder from the archive before calling update or create domain.
1416+ # Function to expand the WDT custom/wallet folders from the archive before calling update domain.
1417+ # The domain may be created by WDT 3 and older archive format, restore any entries prior to update
1418+ # new 4.0 entry paths are config/**
13821419expandWdtArchiveCustomDir () {
13831420 cd ${DOMAIN_HOME} || exitOrLoop
13841421 for file in $( sort_files ${IMG_ARCHIVES_ROOTDIR} " *.zip" )
13851422 do
13861423 ${JAVA_HOME} /bin/jar xf ${IMG_ARCHIVES_ROOTDIR} /${file} wlsdeploy/custom
1424+ ${JAVA_HOME} /bin/jar xf ${IMG_ARCHIVES_ROOTDIR} /${file} wlsdeploy/dbWallets
1425+ ${JAVA_HOME} /bin/jar xf ${IMG_ARCHIVES_ROOTDIR} /${file} config/wlsdeploy/custom
13871426 done
13881427
1389- CUSTOM_DIR=${DOMAIN_HOME} /wlsdeploy/custom
1390- traceDirs before CUSTOM_DIR
1428+ restoreZippedDbWallets
1429+ trace " Listing domain home directories"
1430+ ls -lR ${DOMAIN_HOME}
13911431}
0 commit comments