Merge branch 'serverstartconfig42' into 'release/4.2'

[wko-nightly] [4.2] [intermittent] ItServerStartPolicyConfigCluster  fails

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

Author: rjeberhard

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

@@ -23,6 +23,8 @@
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.isPodRestarted;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkClusterReplicaCountMatches;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.withLongRetryPolicy;
 import static oracle.weblogic.kubernetes.utils.PatchDomainUtils.patchServerStartPolicy;
 import static oracle.weblogic.kubernetes.utils.PodUtils.checkIsPodRestarted;
 import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodDeleted;
@@ -42,6 +44,7 @@
 import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.STOP_SERVER_SCRIPT;
 import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.checkManagedServerConfiguration;
 import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.executeLifecycleScript;
+import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.isManagedServerConfiguration;
 import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.managedServerNamePrefix;
 import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.prepare;
 import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.restoreEnv;
@@ -125,14 +128,15 @@ public void beforeEach() {
 
     // Check configured cluster configuration is available 
     String configServerPodName = domainUid + "-config-cluster-server1";
-    checkPodReadyAndServiceExists(configServerPodName,
-              domainUid, domainNamespace);
-    boolean isServerConfigured = 
-         checkManagedServerConfiguration("config-cluster-server1", domainNamespace, adminServerPodName);
-    assertTrue(isServerConfigured, 
-        "Could not find managed server from configured cluster");
+    checkPodReadyAndServiceExists(configServerPodName, domainUid, domainNamespace);
+
+    testUntil(
+            withLongRetryPolicy,
+            isManagedServerConfiguration("config-cluster-server1", domainNamespace, adminServerPodName),
+            logger,
+            "Waiting until managed server from configured cluster found");
+
     logger.info("Found managed server from configured cluster");
-   
   }
 
   /**

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

@@ -24,6 +24,7 @@
 import oracle.weblogic.domain.DomainSpec;
 import oracle.weblogic.domain.ManagedServer;
 import oracle.weblogic.domain.Model;
+import oracle.weblogic.domain.ProbeTuning;
 import oracle.weblogic.domain.ServerPod;
 import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
 import oracle.weblogic.kubernetes.actions.impl.primitive.CommandParams;
@@ -218,7 +219,7 @@ public static void createDomainResource(
       String encryptionSecretName,
       String configmapName) {
     List<String> securityList = new ArrayList<>();
-    
+
     // create the domain CR
     DomainResource domain = new DomainResource()
         .apiVersion(DOMAIN_API_VERSION)
@@ -240,10 +241,21 @@ public static void createDomainResource(
             .serverPod(new ServerPod()
                 .addEnvItem(new V1EnvVar()
                     .name("JAVA_OPTIONS")
-                    .value("-Dweblogic.StdoutDebugEnabled=false"))
+                    .value("-Dweblogic.security.SSL.ignoreHostnameVerification=true -Xms1024m -Xmx1024m"))
                 .addEnvItem(new V1EnvVar()
                     .name("USER_MEM_ARGS")
-                    .value("-Djava.security.egd=file:/dev/./urandom ")))
+                    .value("-Djava.security.egd=file:/dev/./urandom "))
+                .addEnvItem(new V1EnvVar()
+                    .name("MEM_ARGS")
+                    .value("-Xms1024m -Xmx1024m"))
+                .livenessProbe(new ProbeTuning()
+                    .initialDelaySeconds(300)
+                    .periodSeconds(30)
+                    .failureThreshold(3))
+                .readinessProbe(new ProbeTuning()
+                    .initialDelaySeconds(300)
+                    .periodSeconds(30)
+                    .failureThreshold(3)))
             .adminServer(new AdminServer()
                 .adminService(new AdminService()
                     .addChannelsItem(new Channel()
@@ -286,6 +298,21 @@ public static void createDomainResource(
         + "for %s in namespace %s", domainUid, domNamespace));
   }
 
+  /**
+   * Verify the server MBEAN configuration through rest API.
+   * @param managedServer name of the managed server
+   * @param domainNamespace domain namespace
+   * @param adminServerPodName name of the admin server
+   * @return true if MBEAN is found otherwise false
+   **/
+  public static Callable<Boolean> isManagedServerConfiguration(String managedServer,
+                                                               String domainNamespace,
+                                                               String adminServerPodName) {
+    return () -> {
+      return checkManagedServerConfiguration(managedServer, domainNamespace, adminServerPodName);
+    };
+  }
+
   /**
    * Verify the server MBEAN configuration through rest API.
    * @param managedServer name of the managed server
@@ -297,7 +324,7 @@ public static boolean checkManagedServerConfiguration(String managedServer,
     StringBuffer checkCluster = new StringBuffer(KUBERNETES_CLI + " exec -n "
         + domainNamespace + " " + adminServerPodName)
         .append(" -- /bin/bash -c \"")
-        .append("curl --user ")
+        .append("curl --connect-timeout 10 --max-time 20 --user ")
         .append(ADMIN_USERNAME_DEFAULT + ":" + ADMIN_PASSWORD_DEFAULT)
         .append(" http://" + adminServerPodName + ":7001")
         .append("/management/tenant-monitoring/servers/")