Continued removals

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/helpers/SecretType.java

@@ -9,8 +9,5 @@
 public enum SecretType {
   WebLogicCredentials, 
   ImagePull, 
-  ConfigOverride, 
-  RuntimeEncryption,
-  OpssWalletPassword, 
-  OpssWalletFile
+  ConfigOverride
 }

operator/src/main/java/oracle/kubernetes/operator/logging/MessageKeys.java

@@ -133,10 +133,6 @@ public class MessageKeys {
   public static final String BAD_VOLUME_MOUNT_PATH = "WLSDO-0004";
   public static final String RESERVED_ENVIRONMENT_VARIABLES = "WLSDO-0005";
   public static final String ILLEGAL_SECRET_NAMESPACE = "WLSDO-0006";
-  public static final String ILLEGAL_SIT_CONFIG_MII = "WLSDO-0007";
-  public static final String MODEL_CONFIGMAP_NOT_FOUND = "WLSDO-0008";
-  public static final String SECRET_NOT_SPECIFIED = "WLSDO-0009";
-  public static final String OPSS_SECRET_NOT_SPECIFIED = "WLSDO-0010";
   public static final String NO_CLUSTER_IN_DOMAIN = "WLSDO-0011";
   public static final String NO_MANAGED_SERVER_IN_DOMAIN = "WLSDO-0012";
 

operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainValidationMessages.java

@@ -91,23 +91,7 @@ static String noSuchSecret(String secretName, String namespace, SecretType type)
     return getMessage(MessageKeys.SECRET_NOT_FOUND, secretName, namespace, type);
   }
 
-  static String missingRequiredSecret(String secret) {
-    return getMessage(MessageKeys.SECRET_NOT_SPECIFIED, secret);
-  }
-
-  static String missingRequiredOpssSecret(String secret) {
-    return getMessage(MessageKeys.OPSS_SECRET_NOT_SPECIFIED, secret);
-  }
-
   static String illegalSecretNamespace(String namespace) {
     return getMessage(MessageKeys.ILLEGAL_SECRET_NAMESPACE, namespace);
   }
-
-  static String illegalSitConfigForMii(String configOverrides) {
-    return getMessage(MessageKeys.ILLEGAL_SIT_CONFIG_MII, configOverrides);
-  }
-
-  static String noSuchModelConfigMap(String configMapName, String namespace) {
-    return getMessage(MessageKeys.MODEL_CONFIGMAP_NOT_FOUND, configMapName, namespace);
-  }
 }

operator/src/main/java/oracle/kubernetes/weblogic/domain/model/IntrospectorJobEnvVars.java

@@ -25,39 +25,11 @@ public class IntrospectorJobEnvVars {
    */
   public static final String CREDENTIALS_SECRET_NAME = "CREDENTIALS_SECRET_NAME";
 
-  /**
-   * The credentials used by the introspection job - opss key passphrase.
-   */
-  public static final String OPSS_KEY_SECRET_NAME = "OPSS_KEY_SECRET_NAME";
-
-  /**
-   * The credentials used by the introspection job - opss wallet file.
-   */
-  public static final String OPSS_WALLETFILE_SECRET_NAME = "OPSS_WALLETFILE_SECRET_NAME";
-
-
-  /**
-   * The credentials used by the introspection job - wdt encryption passphrase.
-   */
-  public static final String WDT_ENCRYPTION_PASSPHRASE_NAME = "WDT_ENCRYPTION_PASSPHRASE_NAME";
-
-  /**
-   * The credentials used by the introspection job - runtime encryption secret name.
-   */
-  public static final String RUNTIME_ENCRYPTION_SECRET_NAME = "RUNTIME_ENCRYPTION_SECRET_NAME";
-
-
   /**
    * The domain source type.
    */
   public static final String DOMAIN_SOURCE_TYPE = "DOMAIN_SOURCE_TYPE";
 
-  /**
-   * The wdt domain type.
-   */
-  public static final String WDT_DOMAIN_TYPE = "WDT_DOMAIN_TYPE";
-
-
   /**
    * Returns true if the specified environment variable name is reserved by the operator for communication with
    * the introspection job.

operator/src/main/java/oracle/kubernetes/weblogic/domain/model/Opss.java

@@ -160,16 +160,8 @@ WLSKO-0154=Job {0} failed due to reason: DeadlineExceeded. \
   The job may be retried by the operator up to {3} \
   times with longer ActiveDeadlineSeconds value in each subsequent retry. \
   Use tuning parameter 'domainPresenceFailureRetryMaxCount' to configure max retries.
-WLSKO-0155=Unexpected exception, {0}, while parsing introspect job log [{1}].
 WLSKO-0156=Access denied for operator service account for operation {0} on resource {1} in namespace {2}.
 WLSKO-0157=Domain {0} is not valid: {1}
-WLSKO-0158=Expected CustomResourceDefinition domains.weblogic.oracle not found. But the operator's service \
-  account does not have the permission to {0}. Create or update the CRD and re-install the operator.
-WLSKO-0159=Skipped the verification of the CustomResourceDefinition domains.weblogic.oracle because \
-  the operator's service account does not have the permission to access the existing CustomResourceDefinition.
-WLSKO-0160=Verifying that operator service account can perform operation {1} on required resource {0}.
-WLSKO-0161=Skipped the creation of the namespace watcher because the operator's service account \
-  does not have the permission to access the namespaces in the Kubernetes cluster.
 WLSKO-162=Unable to read internal certificate at path {0}
 WLSKO-163=No external certificate configured for REST endpoint. Endpoint will be disabled.
 WLSKO-0164=Replica request of {0} less than the minimum dynamic server count of {1} configured for cluster {2}
@@ -187,10 +179,6 @@ WLSDO-0003=No volume mount contains path for log home ''{0}''
 WLSDO-0004=The mount path ''{0}'', in entry ''{1}'' of domain resource ''additionalVolumeMounts'', is not valid
 WLSDO-0005=Environment {0} {1}, specified under ''{2}'', {3} reserved for use by the operator
 WLSDO-0006=Bad namespace for weblogicCredentialsSecret: ''{0}''. If specified, must be same as domain namespace.
-WLSDO-0007=Configuration overridesConfigMap ''{0}'' is not supported if ''domainHomeSourceType'' is configured as ''FromModel''. 
-WLSDO-0008=ConfigMap ''{0}'' specified by ''spec.configuration.model.configMap'' not found in namespace ''{1}''.
-WLSDO-0009=The secret ''{0}'' must be specified if ''domainHomeSourceType'' is configured as ''FromModel''.
-WLSDO-0010=The secret ''{0}'' must be specified if ''domainHomeSourceType'' is configured as ''FromModel'' and spec.configuration.model.domainType is configured as ''JRF''.
 WLSDO-0011=Cluster ''{0}'' specified in the domain resource does not exist in the WebLogic domain home configuration.
 WLSDO-0012=Managed Server ''{0}'' specified in the domain resource does not exist in the WebLogic domain home configuration.
 

operator/src/main/resources/Operator.properties

@@ -802,120 +802,6 @@ def addUserConfigAndKey(self):
     finally:
       nmDisconnect()
 
-class MII_DomainConfigGenerator(Generator):
-
-  def __init__(self, env):
-    Generator.__init__(self, env, env.DOMAIN_ZIP)
-    self.env = env
-    self.domain_home = self.env.getDomainHome()
-  def generate(self):
-    self.open()
-    try:
-      self.addDomainConfig()
-      self.close()
-      self.addGeneratedFile()
-    finally:
-      self.close()
-
-  def addDomainConfig(self):
-    em_ear_path = self.env.getEmPath()
-    empath = ''
-    if em_ear_path is not None and os.path.exists(em_ear_path):
-      empath = em_ear_path
-    # Note: only config type is needed fmwconfig, security is excluded because it's in the primordial and contain
-    # all the many policies files
-    packcmd = "tar -pczf /tmp/domain.tar.gz %s/config/config.xml %s/config/jdbc/ %s/config/jms %s/config/coherence " \
-              "%s/config/diagnostics %s/config/startup %s/config/configCache %s/config/nodemanager " \
-              "%s/config/security %s" % (
-              self.domain_home, self.domain_home, self.domain_home, self.domain_home, self.domain_home,
-              self.domain_home, self.domain_home, self.domain_home, self.domain_home, empath)
-    os.system(packcmd)
-    domain_data = self.env.readBinaryFile("/tmp/domain.tar.gz")
-    b64 = ""
-    for s in base64.encodestring(domain_data).splitlines():
-      b64 = b64 + s
-    self.writeln(b64)
-    domainzip_hash = md5.new(domain_data).hexdigest()
-    fh = open("/tmp/domainzip_hash", "w")
-    fh.write(domainzip_hash)
-    fh.close()
-    trace('done zipping up domain ')
-
-
-class MII_OpssWalletFileGenerator(Generator):
-
-  def __init__(self, env):
-    Generator.__init__(self, env, env.EWALLET)
-    self.env = env
-    self.domain_home = self.env.getDomainHome()
-  def generate(self):
-    self.open()
-    try:
-      self.addWallet()
-      self.close()
-      self.addGeneratedFile()
-    finally:
-      self.close()
-
-  def addWallet(self):
-    wallet_data = self.env.readBinaryFile("/tmp/opsswallet/ewallet.p12")
-    b64 = ""
-    for s in base64.encodestring(wallet_data).splitlines():
-      b64 = b64 + s
-    self.writeln(b64)
-    trace("done writing opss key")
-
-
-class MII_PrimordialDomainGenerator(Generator):
-
-  def __init__(self, env):
-    Generator.__init__(self, env, env.PRIMORDIAL_DOMAIN_ZIP)
-    self.env = env
-    self.domain_home = self.env.getDomainHome()
-  def generate(self):
-    self.open()
-    try:
-      self.addPrimordialDomain()
-      self.close()
-      self.addGeneratedFile()
-    finally:
-      self.close()
-
-  def addPrimordialDomain(self):
-    primordial_domain_data = self.env.readBinaryFile("/tmp/prim_domain.tar.gz")
-    b64 = ""
-    for s in base64.encodestring(primordial_domain_data).splitlines():
-      b64 = b64 + s
-    self.writeln(b64)
-    trace("done writing primordial domain")
-
-
-class MII_IntrospectCMFileGenerator(Generator):
-
-  def __init__(self, env, inventory, fromfile):
-    Generator.__init__(self, env, inventory)
-    self.env = env
-    self.fromfile = fromfile
-
-  def generate(self):
-    self.open()
-    try:
-      rc = self.addFile()
-      self.close()
-      if rc is not None:
-        self.addGeneratedFile()
-    finally:
-      self.close()
-
-  def addFile(self):
-    if os.path.exists(self.fromfile):
-      file_str = self.env.readFile(self.fromfile)
-      self.writeln(file_str)
-      return "hasfile"
-    else:
-      return None
-
-
 class SitConfigGenerator(Generator):
 
   def __init__(self, env):