Remove model in image from introspector

Author: rjeberhard

kubernetes/crd/domain-crd.yaml

@@ -20862,6 +20862,3 @@ spec:
   - name: v5
     served: true
     storage: false
-  - name: v6
-    served: true
-    storage: false

kubernetes/crd/domain-v1beta1-crd.yaml

@@ -124,23 +124,6 @@ def open(self):
     self.USERCONFIG_FILE          = self.INTROSPECT_HOME + '/userConfigNodeManager.secure'
     self.USERKEY_FILE             = self.INTROSPECT_HOME + '/userKeyNodeManager.secure'
 
-    # Model in image attributes
-
-    self.DOMAIN_SECRET_MD5_FILE   = '/tmp/DomainSecret.md5'
-    self.DOMAIN_ZIP               = self.INTROSPECT_HOME + '/domainzip.secure'
-    self.PRIMORDIAL_DOMAIN_ZIP    = self.INTROSPECT_HOME + '/primordial_domainzip.secure'
-
-    self.INVENTORY_IMAGE_MD5      = self.INTROSPECT_HOME + '/inventory_image.md5'
-    self.INVENTORY_CM_MD5         = self.INTROSPECT_HOME + '/inventory_cm.md5'
-    self.INVENTORY_PASSPHRASE_MD5 = self.INTROSPECT_HOME + '/inventory_passphrase.md5'
-    self.MERGED_MODEL_FILE        = self.INTROSPECT_HOME + '/merged_model.json'
-    self.EWALLET                  = self.INTROSPECT_HOME + '/ewallet.p12'
-    self.WLS_VERSION              = self.INTROSPECT_HOME + "/wls.version"
-    self.JDK_PATH                 = self.INTROSPECT_HOME + "/jdk.path"
-    self.SECRETS_MD5              = self.INTROSPECT_HOME + "/secrets.md5"
-    self.DOMAINZIP_HASH           = self.INTROSPECT_HOME + "/domainzip_hash"
-    self.WDT_CONFIGMAP_PATH      = self.getEnvOrDef('WDT_CONFIGMAP_PATH',
-                                                    '/weblogic-operator/wdt-config-map')
     self.DOMAIN_SOURCE_TYPE      = self.getEnvOrDef("DOMAIN_SOURCE_TYPE", None)
 
     # The following 4 env vars are for unit testing, their defaults are correct for production.
@@ -182,35 +165,6 @@ def open(self):
     self.domain = cmo
     self.DOMAIN_NAME = self.getDomain().getName()
 
-    # this should only be done for model in image case
-    if self.DOMAIN_SOURCE_TYPE == "FromModel":
-      self.handle_ModelInImageDomain()
-
-  def handle_ModelInImageDomain(self):
-    self.WDT_DOMAIN_TYPE = self.getEnvOrDef('WDT_DOMAIN_TYPE', 'WLS')
-
-    try:
-      # find the em ear source path
-      cd('Application/em')
-      em_attrs = ls(returnMap='true', returnType='a')
-      self.empath = em_attrs['SourcePath']
-    except:
-      self.empath = None
-      pass
-
-    if self.WDT_DOMAIN_TYPE == 'JRF':
-      try:
-        # Only export if it is not there already (i.e. have not been copied from the secrets
-        if not os.path.exists('/tmp/opsswallet/ewallet.p12'):
-          opss_passphrase = self.getEnv('OPSS_PASSPHRASE')
-          os.mkdir('/tmp/opsswallet')
-          exportEncryptionKey(jpsConfigFile=self.getDomainHome() + '/config/fmwconfig/jps-config.xml', \
-                              keyFilePath='/tmp/opsswallet', keyFilePassword=opss_passphrase)
-      except:
-        trace("SEVERE","Error in exporting OPSS key ")
-        dumpStack()
-        sys.exit(1)
-
   def getEmPath(self):
     return self.empath
 
@@ -1408,33 +1362,6 @@ def introspect(self):
       UserConfigAndKeyGenerator(self.env).generate()
       DOMAIN_SOURCE_TYPE      = self.env.getEnvOrDef("DOMAIN_SOURCE_TYPE", None)
 
-      if DOMAIN_SOURCE_TYPE == "FromModel":
-        trace("cfgmap write primordial_domain")
-        MII_PrimordialDomainGenerator(self.env).generate()
-        trace("cfgmap write domain zip")
-        MII_DomainConfigGenerator(self.env).generate()
-        trace("cfgmap write merged model")
-        MII_IntrospectCMFileGenerator(self.env, self.env.MERGED_MODEL_FILE,
-                                      self.env.DOMAIN_HOME +"/wlsdeploy/domain_model.json").generate()
-        trace("cfgmap write md5 image")
-        MII_IntrospectCMFileGenerator(self.env, self.env.INVENTORY_IMAGE_MD5, '/tmp/inventory_image.md5').generate()
-        trace("cfgmap write md5 cm")
-        MII_IntrospectCMFileGenerator(self.env, self.env.INVENTORY_CM_MD5, '/tmp/inventory_cm.md5').generate()
-        trace("cfgmap write wls version")
-        MII_IntrospectCMFileGenerator(self.env, self.env.WLS_VERSION, '/tmp/wls_version').generate()
-        trace("cfgmap write jdk_path")
-        MII_IntrospectCMFileGenerator(self.env, self.env.JDK_PATH, '/tmp/jdk_path').generate()
-        trace("cfgmap write md5 secrets")
-        MII_IntrospectCMFileGenerator(self.env, self.env.SECRETS_MD5, '/tmp/secrets.md5').generate()
-        trace("cfgmap write model hash")
-        # Must be called after MII_PrimordialDomainGenerator
-        MII_IntrospectCMFileGenerator(self.env, self.env.DOMAINZIP_HASH, '/tmp/domainzip_hash').generate()
-
-        if self.env.WDT_DOMAIN_TYPE == 'JRF':
-          trace("cfgmap write JRF wallet")
-          MII_OpssWalletFileGenerator(self.env).generate()
-
-
     CustomSitConfigIntrospector(self.env).generateAndValidate()
 
     # If the topology is invalid, the generated topology

operator/src/main/java/oracle/kubernetes/operator/ModelInImageDomainType.java

@@ -87,7 +87,6 @@ checkEnv -q \
 
 for script_file in "${SCRIPTPATH}/wlst.sh" \
                    "${SCRIPTPATH}/startNodeManager.sh"  \
-                   "${SCRIPTPATH}/modelInImage.sh"  \
                    "${SCRIPTPATH}/introspectDomain.py"; do
   [ ! -f "$script_file" ] && trace SEVERE "Missing file '${script_file}'." && exit 1 
 done 
@@ -104,41 +103,6 @@ if [ ! -z "${DATA_HOME}" ] && [ ! -d "${DATA_HOME}" ]; then
   createFolder ${DATA_HOME}
 fi
 
-
-traceTiming "INTROSPECTOR '${DOMAIN_UID}' MII CREATE DOMAIN START"
-
-source ${SCRIPTPATH}/modelInImage.sh
-
-if [ $? -ne 0 ]; then
-      trace SEVERE "Error sourcing modelInImage.sh" && exit 1
-fi
-# Add another env/attribute in domain yaml for model in image
-# log error if dir exists and attribute set
-DOMAIN_CREATED=0
-if [ ${DOMAIN_SOURCE_TYPE} == "FromModel" ]; then
-    trace "Beginning Model In Image"
-    command -v gzip
-    if [ $? -ne 0 ] ; then
-      trace SEVERE "gzip is missing - image must have gzip installed " && exit 1
-    fi
-    command -v tar
-    if [ $? -ne 0 ] ; then
-      trace SEVERE "tar is missing - image must have tar installed " && exit 1
-    fi
-    mkdir -p ${DOMAIN_HOME}
-    if [ $? -ne 0 ] ; then
-      trace SEVERE "cannot create domain home directory '${DOMAIN_HOME}'" && exit 1
-    fi
-    createWLDomain || exit 1
-    created_domain=$DOMAIN_CREATED
-    trace "created domain return code = " ${created_domain}
-else
-    created_domain=1
-fi
-
-traceTiming "INTROSPECTOR '${DOMAIN_UID}' MII CREATE DOMAIN END" 
-
-
 # check DOMAIN_HOME for a config/config.xml, reset DOMAIN_HOME if needed
 
 exportEffectiveDomainHome || exit 1
@@ -155,35 +119,28 @@ checkWebLogicVersion || exit 1
 
 # start node manager
 # run instrospector wlst script
-if [ ${created_domain} -ne 0 ]; then
-
-    traceTiming "INTROSPECTOR '${DOMAIN_UID}' MII NM START" 
+traceTiming "INTROSPECTOR '${DOMAIN_UID}' NM START"
 
-    # start node manager -why ??
-    trace "Starting node manager"
-    ${SCRIPTPATH}/startNodeManager.sh || exit 1
+# start node manager -why ??
+trace "Starting node manager"
+${SCRIPTPATH}/startNodeManager.sh || exit 1
 
-    traceTiming "INTROSPECTOR '${DOMAIN_UID}' MII NM END" 
+traceTiming "INTROSPECTOR '${DOMAIN_UID}' NM END"
 
-    traceTiming "INTROSPECTOR '${DOMAIN_UID}' MII MD5 START"
+traceTiming "INTROSPECTOR '${DOMAIN_UID}' MD5 START"
 
-    traceTiming "INTROSPECTOR '${DOMAIN_UID}' MII NM END" 
+# put domain secret's md5 cksum in file '/tmp/DomainSecret.md5'
+# the introspector wlst script and WL server pods will use this value
+generateDomainSecretMD5File '/tmp/DomainSecret.md5' || exit 1
 
-    traceTiming "INTROSPECTOR '${DOMAIN_UID}' MII MD5 START"
+traceTiming "INTROSPECTOR '${DOMAIN_UID}' MD5 END"
 
-    # put domain secret's md5 cksum in file '/tmp/DomainSecret.md5'
-    # the introspector wlst script and WL server pods will use this value
-    generateDomainSecretMD5File '/tmp/DomainSecret.md5' || exit 1
+traceTiming "INTROSPECTOR '${DOMAIN_UID}' INTROSPECT START"
 
-    traceTiming "INTROSPECTOR '${DOMAIN_UID}' MII MD5 END"
+trace "Running introspector WLST script ${SCRIPTPATH}/introspectDomain.py"
+${SCRIPTPATH}/wlst.sh ${SCRIPTPATH}/introspectDomain.py || exit 1
 
-    traceTiming "INTROSPECTOR '${DOMAIN_UID}' INTROSPECT START"
-
-    trace "Running introspector WLST script ${SCRIPTPATH}/introspectDomain.py"
-    ${SCRIPTPATH}/wlst.sh ${SCRIPTPATH}/introspectDomain.py || exit 1
-
-    traceTiming "INTROSPECTOR '${DOMAIN_UID}' INTROSPECT END"
-fi
+traceTiming "INTROSPECTOR '${DOMAIN_UID}' INTROSPECT END"
 trace "Domain introspection complete"
 
 exit 0