Merge branch 'fix-onlineupdate14120-42' into 'release/4.2'

Correct online update going through upgrade logic by mistake

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

Author: rjeberhard

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

@@ -396,7 +396,7 @@ createWLDomain() {
   # create domain again
 
   DISABLE_SM_FOR_12214_NONSM_UPG=0
-  if [  -f ${PRIMORDIAL_DOMAIN_ZIPPED} ] ; then
+  if [ -f ${PRIMORDIAL_DOMAIN_ZIPPED} ] &&  [ -z "${MII_USE_ONLINE_UPDATE}" ] || [ "${MII_USE_ONLINE_UPDATE}" != "true" ] ]; then
     checkSecureModeForUpgrade
   fi
   if  [ ${WDT_ARTIFACTS_CHANGED} -ne 0 ] || [ ${jdk_changed} -eq 1 ] \

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

@@ -410,6 +410,7 @@ def upgradeServerIfNeeded(model):
     result = fh.read()
     fh.close()
     found = False
+    # if secure mode is not enabled in existing domain
     if result == 'False':
         # check if model has anything set
         # if domainInfo already set to secure or in dev mode then do not set it, prod mode will not be secure