Merge branch 'wdt-logdir-fix' into 'main'

Add support of WLSDEPLOY_LOG_DIRECTORY from WDT and fix script error in opss-wallet.sh See merge request weblogic-cloud/weblogic-kubernetes-operator!4560
oracle · Feb 8, 2024 · 887414d · 887414d
2 parents d5affe7 + dcb66d9
commit 887414d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/kubernetes/samples/scripts/domain-lifecycle/opss-wallet.sh b/kubernetes/samples/scripts/domain-lifecycle/opss-wallet.sh
@@ -144,9 +144,7 @@ fi
 
 if [ ${RESTORE_WALLET} -eq 1 ] ; then
   echo "@@ Info: Creating secret '${WALLET_SECRET}' in namespace '${DOMAIN_NAMESPACE}' for wallet file '${WALLET_FILE}', domain uid '${DOMAIN_UID}'."
-  $SCRIPTDIR/create-secret.sh \
-    -n ${DOMAIN_NAMESPACE} \
-    -d ${DOMAIN_UID} \
-    -s ${WALLET_SECRET} \
-    -f walletFile=${WALLET_FILE}
+  ${KUBERNETES_CLI:-kubectl} -n ${DOMAIN_NAMESPACE} create secret generic \
+    ${WALLET_SECRET} \
+    --from-file=walletFile=${WALLET_FILE}
 fi
diff --git a/operator/src/main/resources/scripts/createDomainOnPV.sh b/operator/src/main/resources/scripts/createDomainOnPV.sh
@@ -19,7 +19,8 @@ IMG_VARIABLE_FILES_ROOTDIR="${IMG_MODELS_HOME}"
 WDT_ROOT="/auxiliary/weblogic-deploy"
 WDT_OUTPUT_DIR="${LOG_HOME:-/tmp}"
 WDT_OUTPUT="${WDT_OUTPUT_DIR}/wdt_output.log"
-WDT_CREATE_DOMAIN_LOG=${WDT_ROOT}/logs/createDomain.log
+WDT_CREATE_DOMAIN_LOGROOT="${WLSDEPLOY_LOG_DIRECTORY:-$(echo ${WDT_ROOT}/logs)}"
+WDT_CREATE_DOMAIN_LOG="${WDT_CREATE_DOMAIN_LOGROOT}/createDomain.log"
 WDT_BINDIR="${WDT_ROOT}/bin"
 WLSDEPLOY_PROPERTIES="${WLSDEPLOY_PROPERTIES} -Djava.security.egd=file:/dev/./urandom"
 WDT_CONFIGMAP_ROOT="/weblogic-operator/wdt-config-map"

diff --git a/operator/src/main/resources/scripts/wdt_common.sh b/operator/src/main/resources/scripts/wdt_common.sh
@@ -84,7 +84,8 @@ wdtRotateAndCopyLogFile() {
 
   logFileRotate "${WDT_OUTPUT_DIR}/${logFileName}" "${WDT_LOG_FILE_MAX:-11}"
 
-  cp ${WDT_ROOT}/logs/${logFileName} ${WDT_OUTPUT_DIR}/
+  WDT_LOG_ROOT="${WLSDEPLOY_LOG_DIRECTORY:-$(echo $WDT_ROOT/logs)}"
+  cp "${WDT_LOG_ROOT}/${logFileName}" ${WDT_OUTPUT_DIR}/
 }