remove ALLOW_DYNAMIC_CLUSTER_IN_FMW flag and remove validation that FMW infrastruction domain cannot use dynamic cluster (#2375)

Author: alai8

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWDT.java

@@ -187,7 +187,6 @@ public void testFmwDomainOnPVUsingWdt() {
                                              pvName,
                                              pvcName,
                                              DOMAINHOMEPREFIX,
-                                             "true",
                                              replicaCount,
                                              t3ChannelPort);
 

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicClusterMiiDomain.java

@@ -252,9 +252,6 @@ private void createDomainCrAndVerify(
                 .includeServerOutInPodLog(true)
                 .serverStartPolicy("IF_NEEDED")
                 .serverPod(new ServerPod()
-                    .addEnvItem(new V1EnvVar()
-                        .name("ALLOW_DYNAMIC_CLUSTER_IN_FMW")
-                        .value("true"))
                     .addEnvItem(new V1EnvVar()
                         .name("JAVA_OPTIONS")
                         .value("-Dweblogic.StdoutDebugEnabled=false"))

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicDomainInPV.java

@@ -223,9 +223,6 @@ private void createDomainCrAndVerify(String pvName,
                 .addEnvItem(new V1EnvVar()
                     .name("USER_MEM_ARGS")
                     .value("-Djava.security.egd=file:/dev/./urandom"))
-                .addEnvItem(new V1EnvVar()
-                    .name("ALLOW_DYNAMIC_CLUSTER_IN_FMW")
-                    .value("true"))
                 .addVolumesItem(new V1Volume()
                     .name(pvName)
                     .persistentVolumeClaim(new V1PersistentVolumeClaimVolumeSource()

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/FmwUtils.java

@@ -113,7 +113,6 @@ public static Domain createDomainResource(
    * @param pvName name of the persistent volume to create
    * @param pvcName name of the persistent volume claim to create
    * @param domainInHomePrefix prefix of path of domain in home
-   * @param allowDynClusterInFmw true to create a FMW dynamic domain, false otherwise
    * @param replicaCount count of replicas
    * @param t3ChannelPort port number of t3 channel
    * @return Domain WebLogic domain
@@ -125,7 +124,6 @@ public static Domain createDomainResourceOnPv(String domainUid,
                                                 String pvName,
                                                 String pvcName,
                                                 String domainInHomePrefix,
-                                                String allowDynClusterInFmw,
                                                 int replicaCount,
                                                 int t3ChannelPort) {
     // create a domain custom resource configuration object
@@ -159,9 +157,6 @@ public static Domain createDomainResourceOnPv(String domainUid,
                 .addEnvItem(new V1EnvVar()
                     .name("USER_MEM_ARGS")
                     .value("-Djava.security.egd=file:/dev/./urandom"))
-                .addEnvItem(new V1EnvVar()
-                    .name("ALLOW_DYNAMIC_CLUSTER_IN_FMW")
-                    .value(allowDynClusterInFmw))
                 .addVolumesItem(new V1Volume()
                     .name(pvName)
                     .persistentVolumeClaim(new V1PersistentVolumeClaimVolumeSource()

operator/integration-tests/introspector/introspectTest.sh

@@ -116,7 +116,6 @@ export ISTIO_ENABLED=${ISTIO_ENABLED:-false}
 export ISTIO_READINESS_PORT=${ISTIO_READINESS_PORT:-8888}
 export T3_PUBLIC_ADDRESS=${T3_PUBLIC_ADDRESS:-}
 export PRODUCTION_MODE_ENABLED=${PRODUCTION_MODE_ENABLED:-true}
-export ALLOW_DYNAMIC_CLUSTER_IN_FMW=${ALLOW_DYNAMIC_CLUSTER_IN_FMW:-false}
 
 # whether this test run is expecting a domain validation error
 export EXPECT_INVALID_DOMAIN=${EXPECT_INVALID_DOMAIN:-false}

operator/integration-tests/introspector/wl-introspect-pod.yamlt

@@ -30,8 +30,6 @@ spec:
       value: "${DATA_HOME}"
     - name: CREDENTIALS_SECRET_NAME
       value: "${WEBLOGIC_CREDENTIALS_SECRET_NAME}"
-    - name: ALLOW_DYNAMIC_CLUSTER_IN_FMW
-      value: "${ALLOW_DYNAMIC_CLUSTER_IN_FMW}"
     - name: DOMAIN_SOURCE_TYPE
       value: "${DOMAIN_SOURCE_TYPE}"
     - name: WDT_DOMAIN_TYPE
@@ -41,7 +39,7 @@ spec:
     - name: ISTIO_READINESS_PORT
       value: "${ISTIO_READINESS_PORT:-8888}"
     - name: OPERATOR_ENVVAR_NAMES
-      value: "JAVA_OPTIONS,NAMESPACE,DOMAIN_UID,DOMAIN_HOME,NODEMGR_HOME,LOG_HOME,DATA_HOME,CREDENTIALS_SECRET_NAME,ALLOW_DYNAMIC_CLUSTER_IN_FMW,DOMAIN_SOURCE_TYPE,WDT_DOMAIN_TYPE,ISTIO_ENABLED,ISTIO_READINESS_PORT"
+      value: "JAVA_OPTIONS,NAMESPACE,DOMAIN_UID,DOMAIN_HOME,NODEMGR_HOME,LOG_HOME,DATA_HOME,CREDENTIALS_SECRET_NAME,DOMAIN_SOURCE_TYPE,WDT_DOMAIN_TYPE,ISTIO_ENABLED,ISTIO_READINESS_PORT"
     image: "${WEBLOGIC_IMAGE_NAME}:${WEBLOGIC_IMAGE_TAG}"
     imagePullPolicy: ${WEBLOGIC_IMAGE_PULL_POLICY}
     name: weblogic-server

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

@@ -156,14 +156,6 @@ def open(self):
     self.CUSTOM_SITCFG_PATH      = self.getEnvOrDef('CUSTOM_SITCFG_PATH', '/weblogic-operator/config-overrides')
     self.NM_HOST                 = self.getEnvOrDef('NM_HOST', 'localhost')
 
-    # Set IS_FMW_INFRA to True if the image contains a FMW infrastructure domain
-    # (dectected by checking the RCUPREFIX environment variable)
-    self.IS_FMW_INFRA_DOMAIN = self.isEnvSet('RCUPREFIX')
-
-    # Check environment variable that allows dynamic clusters in FMW infrastructure
-    # domains
-    self.ALLOW_DYNAMIC_CLUSTER_IN_FMW = self.getEnvOrDef('ALLOW_DYNAMIC_CLUSTER_IN_FMW', "False")
-
     # maintain a list of errors that we include in topology.yaml on completion, if any
 
     self.errors             = []
@@ -233,12 +225,6 @@ def getDataHome(self):
   def isAccessLogInLogHome(self):
     return self.ACCESS_LOG_IN_LOG_HOME == 'true';
 
-  def isFMWInfraDomain(self):
-    return self.IS_FMW_INFRA_DOMAIN
-
-  def allowDynamicClusterInFMWInfraDomain(self):
-    return self.ALLOW_DYNAMIC_CLUSTER_IN_FMW.lower() == 'true'
-
   def addError(self, error):
     self.errors.append(error)
 
@@ -422,10 +408,7 @@ def validateCluster(self, cluster):
     if self.getDynamicServersOrNone(cluster) is None:
       self.validateNonDynamicCluster(cluster)
     else:
-      if self.env.isFMWInfraDomain() and not self.env.allowDynamicClusterInFMWInfraDomain():
-        self.addError("WebLogic dynamic clusters are not supported in FMW Infrastructure domains. Set ALLOW_DYNAMIC_CLUSTER_IN_FMW environment variable to true to bypass this validation.")
-      else:
-        self.validateDynamicCluster(cluster)
+      self.validateDynamicCluster(cluster)
 
   def validateNonDynamicCluster(self, cluster):
     self.validateNonDynamicClusterReferencedByAtLeastOneServer(cluster)