Merge branch 'fix-getwlsversion-and-matchmodelunzip' into 'main'

Fix how getWebLogicVersion is implemented and keep track of bin/lib contents...

See merge request weblogic-cloud/weblogic-kubernetes-operator!4682

(cherry picked from commit 0bcc038)

3e2fdf8 Fix how getWebLogicVersion is implemented and keep track of bin/lib contents...

Author: rjeberhard

operator/src/main/resources/scripts/introspectDomain.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 # ------------
@@ -165,6 +165,9 @@ def open(self):
     # Check environment variable that skip leasing validation
     self.SKIP_LEASING_VALIDATIONS = self.getEnvOrDef('SKIP_LEASING_VALIDATIONS', "False")
 
+    # Extracted list for bin lib during domain creation
+    self.DOMAIN_LIB_BIN_LIST = self.INTROSPECT_HOME + "/binliblist"
+
     # maintain a list of errors that we include in topology.yaml on completion, if any
 
     self.errors             = []
@@ -1969,6 +1972,8 @@ def introspect(self):
         trace("cfgmap write domain wdt version")
         if os.path.exists('/tmp/domain_wdt_version'):
           MII_IntrospectCMFileGenerator(self.env, self.env.MII_DOMAIN_WDT_VERSION, '/tmp/domain_wdt_version').generate()
+        if os.path.exists('/tmp/binlibdir.txt'):
+          MII_IntrospectCMFileGenerator(self.env, self.env.DOMAIN_LIB_BIN_LIST, '/tmp/binlibdir.txt').generate()
 
       if self.isFromModelAndJRFDomain() or self.isInitializeDomainJRFOnPV():
         trace("cfgmap write JRF wallet")

operator/src/main/resources/scripts/modelInImage.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 # This script contains the all the function of model in image
@@ -28,7 +28,7 @@ LOCAL_PRIM_DOMAIN_TAR="/tmp/prim_domain.tar"
 NEW_MERGED_MODEL="/tmp/new_merged_model.json"
 WDT_CONFIGMAP_ROOT="/weblogic-operator/wdt-config-map"
 RUNTIME_ENCRYPTION_SECRET_PASSWORD="/weblogic-operator/model-runtime-secret/password"
-
+DOMAIN_BIN_LIB_LIST="/weblogic-operator/introspector/binliblist"
 # we export the opss password file location because it's also used by introspectDomain.py
 export OPSS_KEY_PASSPHRASE="/weblogic-operator/opss-walletkey-secret/walletPassword"
 OPSS_KEY_B64EWALLET="/weblogic-operator/opss-walletfile-secret/walletFile"
@@ -1065,6 +1065,8 @@ wdtUpdateModelDomain() {
   #
   local MII_PASSPHRASE=$(cat ${RUNTIME_ENCRYPTION_SECRET_PASSWORD})
 
+  captureBinLibAdded
+
   gzip ${DOMAIN_HOME}/wlsdeploy/domain_model.json || exitOrLoop
   base64 ${DOMAIN_HOME}/wlsdeploy/domain_model.json.gz > ${DOMAIN_HOME}/wlsdeploy/domain_model.json.b64 || exitOrLoop
   encrypt_decrypt_model "encrypt" ${DOMAIN_HOME}/wlsdeploy/domain_model.json.b64 ${MII_PASSPHRASE} \
@@ -1077,6 +1079,12 @@ wdtUpdateModelDomain() {
   trace "Exiting wdtUpdateModelDomain"
 }
 
+captureBinLibAdded() {
+  local BINLIBDIR_NAME="/tmp/binlibdir.txt"
+  find $DOMAIN_HOME/bin -maxdepth 1 -type f | sed  "s|$DOMAIN_HOME/bin|wlsdeploy/domainBin|g" > $BINLIBDIR_NAME
+  find $DOMAIN_HOME/lib -maxdepth 1 -type f | sed  "s|$DOMAIN_HOME/bin|wlsdeploy/domainLibraries|g" >> $BINLIBDIR_NAME
+}
+
 wdtHandleOnlineUpdate() {
 
   trace "Entering wdtHandleOnlineUpdate"
@@ -1305,7 +1313,11 @@ restoreAppAndLibs() {
 
         # expand the archive domain libraries to the domain lib, 11 is caution when zip entry doesn't exists
         cd ${DOMAIN_HOME}/lib || exitOrLoop
-        unzip -jo ${IMG_ARCHIVES_ROOTDIR}/${file} wlsdeploy/domainLibraries/*
+        if [ -f $DOMAIN_BIN_LIB_LIST ] ; then
+          unzip -jo ${IMG_ARCHIVES_ROOTDIR}/${file} $(awk '{print $0}' <<< $(grep "wlsdeploy/domainLibraries" $DOMAIN_BIN_LIB_LIST))
+        else
+          unzip -jo ${IMG_ARCHIVES_ROOTDIR}/${file} wlsdeploy/domainLibraries/*
+        fi
         ret=$?
         if [ $ret -ne 0 ] && [ $ret -ne 11 ] ; then
           trace SEVERE  "Domain Source Type is FromModel, error in extracting domainLibraries " \
@@ -1316,7 +1328,13 @@ restoreAppAndLibs() {
         # expand the domain bin, in update case user may only update a file in the domainBin archive, 11 is caution when
         # zip entry doesn't exists
         cd ${DOMAIN_HOME}/bin || exitOrLoop
-        unzip -jo ${IMG_ARCHIVES_ROOTDIR}/${file} wlsdeploy/domainBin/*
+        if [ -f $DOMAIN_BIN_LIB_LIST ] ; then
+          unzip -jo ${IMG_ARCHIVES_ROOTDIR}/${file} $(awk '{print $0}' <<< $(grep "wlsdeploy/domainBin" $DOMAIN_BIN_LIB_LIST))
+        else
+          unzip -jo ${IMG_ARCHIVES_ROOTDIR}/${file} wlsdeploy/domainBin/*
+        fi
+
+        #unzip -jo ${IMG_ARCHIVES_ROOTDIR}/${file} wlsdeploy/domainBin/*
         ret=$?
         if [ $ret -ne 0 ] && [ $ret -ne 11 ] ; then
           trace SEVERE  "Domain Source Type is FromModel, error in extracting domainBin " \

operator/src/main/resources/scripts/utils.sh

@@ -1,4 +1,5 @@
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
+#!/bin/sh
+# Copyright (c) 2017, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 set -o pipefail
@@ -494,21 +495,16 @@ hasWebLogicPatches()
 }
 
 # getWebLogicVersion
-#   parse wl version from install inventory
 #   - if we can't get a version number then we return
 #     a high dummy version number that's sufficient
 #     to pass version checks "9999.9999.9999.9999"
-#   - we parse the install inventory as this is far faster than
-#     using opatch or weblogic.version
 getWebLogicVersion()
 {
-  local reg_file=$ORACLE_HOME/inventory/registry.xml
+  $ORACLE_HOME/oracle_common/common/bin/wlst.sh /weblogic-operator/scripts/wlversion.py > /dev/null 2>&1
 
-  [ ! -f $reg_file ] && echo "9999.9999.9999.9999" && return
-
-  # The following grep captures both "WebLogic Server" and "WebLogic Server for FMW"
-  local wlver="`grep 'name="WebLogic Server.*version=' $reg_file \
-               | sed 's/.*version="\([0-9.]*\)".*/\1/g'`"
+  if [ $? -eq 0 ] ; then
+    wlver=$(cat /tmp/wlsversion.txt)
+  fi
 
   echo ${wlver:-"9999.9999.9999.9999"}
 }
@@ -538,9 +534,9 @@ getMajorVersion()
 # checkWebLogicVersion
 #   check if the WL version is supported by the Operator
 #   - skip check if SKIP_WL_VERSION_CHECK = "true"
-#   - log an error if WL version < 12.2.1.3
-#   - log an error if WL version == 12.2.1.3 && patch 29135930 is missing
-#     - you can override the required 12.2.1.3 patches by exporting
+#   - log an error if WL version < 12.2.1.3.0
+#   - log an error if WL version == 12.2.1.3.0 && patch 29135930 is missing
+#     - you can override the required 12.2.1.3.0 patches by exporting
 #       global WL12213REQUIREDPATCHES to an empty string or to other
 #       patch number(s)
 #   - return 1 if logged an error
@@ -549,11 +545,11 @@ checkWebLogicVersion()
 {
   [ "$SKIP_WL_VERSION_CHECK" = "true" ] && return 0
   local cur_wl_ver="`getWebLogicVersion`"
-  local exp_wl_ver="12.2.1.3" 
+  local exp_wl_ver="12.2.1.3.0"
   local exp_wl_12213_patches="${WL12213REQUIREDPATCHES:-"29135930"}"
-  if versionEQ "$cur_wl_ver" "12.2.1.3" ; then
+  if versionEQ "$cur_wl_ver" "12.2.1.3.0" ; then
     if ! hasWebLogicPatches $exp_wl_12213_patches ; then
-      trace SEVERE "The Operator requires that WebLogic version '12.2.1.3' have patch '$exp_wl_12213_patches'. To bypass this check, set env var SKIP_WL_VERSION_CHECK to 'true'."
+      trace SEVERE "The Operator requires that WebLogic version '12.2.1.3.0' have patch '$exp_wl_12213_patches'. To bypass this check, set env var SKIP_WL_VERSION_CHECK to 'true'."
       return 1
     fi
   fi

operator/src/main/resources/scripts/wlversion.py

@@ -0,0 +1,8 @@
+# Copyright (c) 2024, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+import weblogic.version as version_helper
+fh = open('/tmp/wlsversion.txt', 'w')
+fh.write(version_helper.getReleaseBuildVersion())
+fh.close()
+exit()