Merge branch 'develop' of https://github.com/oracle/weblogic-kubernetes-operator into feature-operator-helm-hooks

Author: moreaut

integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java

@@ -148,6 +148,7 @@ public static void initialize(String appPropsFile) throws Exception {
    */
   public void testAdminServerExternalService(Domain domain) throws Exception {
     logger.info("Inside testAdminServerExternalService");
+    TestUtils.renewK8sClusterLease(getProjectRoot(), getLeaseId());
     domain.verifyAdminServerExternalService(getUsername(), getPassword());
     logger.info("Done - testAdminServerExternalService");
   }
@@ -159,6 +160,7 @@ public void testAdminServerExternalService(Domain domain) throws Exception {
    */
   public void testAdminT3Channel(Domain domain) throws Exception {
     logger.info("Inside testAdminT3Channel");
+    TestUtils.renewK8sClusterLease(getProjectRoot(), getLeaseId());
     Map<String, Object> domainMap = domain.getDomainMap();
     // check if the property is set to true
     Boolean exposeAdmint3Channel = (Boolean) domainMap.get("exposeAdminT3Channel");
@@ -203,6 +205,7 @@ public void testDomainLifecyle(Operator operator, Domain domain) throws Exceptio
    */
   public void testClusterScaling(Operator operator, Domain domain) throws Exception {
     logger.info("Inside testClusterScaling");
+    TestUtils.renewK8sClusterLease(getProjectRoot(), getLeaseId());
     Map<String, Object> domainMap = domain.getDomainMap();
     String domainUid = domain.getDomainUid();
     String domainNS = domainMap.get("namespace").toString();
@@ -263,6 +266,7 @@ public void testClusterScaling(Operator operator, Domain domain) throws Exceptio
    */
   public void testWLDFScaling(Operator operator, Domain domain) throws Exception {
     logger.info("Inside testWLDFScaling");
+    TestUtils.renewK8sClusterLease(getProjectRoot(), getLeaseId());
 
     Map<String, Object> domainMap = domain.getDomainMap();
     String domainUid = domain.getDomainUid();

integration-tests/src/test/java/oracle/kubernetes/operator/ITOperator.java

@@ -127,7 +127,6 @@ public void test3CreateDomainInTest1NS() throws Exception {
     }
     // create domain3
     Domain domain3 = testDomainCreation(domain3YamlFile);
-
     testWLDFScaling(operator1, domain3);
     logger.info("SUCCESS - test3CreateDomainInTest1NS");
   }
@@ -219,8 +218,6 @@ public void test7CreateDomainPVReclaimPolicyRecycle() throws Exception {
 
   @Test
   public void test8WlsLivenessProbe() throws Exception {
-    Assume.assumeFalse(
-        System.getenv("QUICKTEST") != null && System.getenv("QUICKTEST").equalsIgnoreCase("true"));
 
     logTestBegin("test8WlsLivenessProbe");
     logger.info("Checking if operator1 is running, if not creating");
@@ -299,9 +296,13 @@ private Domain testAllUseCasesForADomain(Operator operator, String domainYamlFil
     logger.info("Creating Domain & verifing the domain creation");
     // create domain1
     Domain domain = testDomainCreation(domainYamlFile);
-    testDomainLifecyle(operator, domain);
+    if (System.getenv("QUICKTEST") == null
+        || (System.getenv("QUICKTEST") != null
+            && !System.getenv("QUICKTEST").equalsIgnoreCase("true"))) {
+      testDomainLifecyle(operator, domain);
+      testOperatorLifecycle(operator, domain);
+    }
     testClusterScaling(operator, domain);
-    testOperatorLifecycle(operator, domain);
     return domain;
   }
 

integration-tests/src/test/java/oracle/kubernetes/operator/utils/TestUtils.java

@@ -230,7 +230,10 @@ public static void testWlsLivenessProbe(String domainUid, String serverName, Str
 
     // kill server process 3 times
     for (int i = 0; i < 3; i++) {
-      kubectlexecNoCheck(podName, namespace, "/shared/killserver.sh");
+      ExecResult result = kubectlexecNoCheck(podName, namespace, "/shared/killserver.sh");
+      logger.info("kill server process command exitValue " + result.exitValue());
+      logger.info(
+          "kill server process command result " + result.stdout() + " stderr " + result.stderr());
       Thread.sleep(2 * 1000);
     }
     // one more time so that liveness probe restarts
@@ -241,6 +244,7 @@ public static void testWlsLivenessProbe(String domainUid, String serverName, Str
     while (true) {
       long currentTime = System.currentTimeMillis();
       int finalRestartCnt = getPodRestartCount(podName, namespace);
+      logger.info("initialRestartCnt " + initialRestartCnt + " finalRestartCnt " + finalRestartCnt);
       if ((finalRestartCnt - initialRestartCnt) == 1) {
         logger.info("WLS liveness probe test is successful.");
         break;
@@ -301,6 +305,8 @@ public static ExecResult kubectlexecNoCheck(String podName, String namespace, St
         .append(" ")
         .append(scriptPath);
 
+    ExecResult result = ExecCommand.exec("kubectl get pods -n " + namespace);
+    logger.info("get pods before killing the server " + result.stdout() + "\n " + result.stderr());
     logger.info("Command to call kubectl sh file " + cmdKubectlSh);
     return ExecCommand.exec(cmdKubectlSh.toString());
   }
@@ -526,11 +532,11 @@ public static void renewK8sClusterLease(String projectRoot, String leaseId) thro
                 + " to try renew the lease. "
                 + "Some of the potential reasons for this failure are that another run"
                 + "may have obtained the lease, the lease may have been externally "
-                + "deleted, or the caller of run.sh may have forgotten to obtain the"
-                + "lease before calling run.sh (using 'lease.sh -o \"$LEASE_ID\"'). "
+                + "deleted, or the caller of the test may have forgotten to obtain the "
+                + "lease before calling the test (using 'lease.sh -o \"$LEASE_ID\"'). "
                 + "To force delete a lease no matter who owns the lease,"
                 + "call 'lease.sh -f' or 'kubernetes delete cm acceptance-test-lease'"
-                + "(this should only be done when sure there's no current run.sh "
+                + "(this should only be done when sure there's no current java tests "
                 + "that owns the lease).  To view the current lease holder,"
                 + "use 'lease.sh -s'.  To disable this lease check, do not set"
                 + "the LEASE_ID environment variable.");

operator/pom.xml

@@ -338,11 +338,6 @@
             <artifactId>simplestub</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-          <groupId>com.google.code.tempus-fugit</groupId>
-          <artifactId>tempus-fugit</artifactId>
-          <version>1.1</version>
-        </dependency>
     </dependencies>
 
 </project>

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

@@ -417,10 +417,8 @@ public Set<Entry<String, ServerKubernetesObjects>> entrySet() {
     @Override
     public ServerKubernetesObjects putIfAbsent(String key, ServerKubernetesObjects value) {
       ServerKubernetesObjects result = delegate.putIfAbsent(key, value);
-      DomainPresenceMonitor.putIfAbsent(key, result);
       if (result == null) {
         Domain d = domain.get();
-        DomainPresenceMonitor.putIfAbsentDomain(d);
         if (d != null) {
           ServerKubernetesObjectsManager.register(d.getSpec().getDomainUID(), key, value);
         }

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

@@ -34,12 +34,10 @@ public static ServerKubernetesObjects lookup(String serverLegalName) {
   }
 
   static void register(String domainUID, String serverName, ServerKubernetesObjects sko) {
-    DomainPresenceMonitor.registered(serverName);
     serverMap.put(LegalNames.toServerName(domainUID, serverName), sko);
   }
 
   static void unregister(String domainUID, String serverName) {
-    DomainPresenceMonitor.unregistered(serverName);
     serverMap.remove(LegalNames.toServerName(domainUID, serverName));
   }
 

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

@@ -11,52 +11,23 @@
 import static org.hamcrest.Matchers.sameInstance;
 import static org.hamcrest.junit.MatcherAssert.assertThat;
 
-import com.google.code.tempusfugit.concurrency.IntermittentTestRunner;
-import com.google.code.tempusfugit.concurrency.annotations.Intermittent;
 import com.meterware.simplestub.Memento;
 import com.meterware.simplestub.StaticStubSupport;
 import io.kubernetes.client.models.V1ObjectMeta;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import oracle.kubernetes.TestUtils;
 import oracle.kubernetes.weblogic.domain.v2.Domain;
 import oracle.kubernetes.weblogic.domain.v2.DomainSpec;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
-import org.junit.runner.RunWith;
 
-@RunWith(IntermittentTestRunner.class)
 public class ServerKubernetesObjectsLookupTest {
 
   private List<Memento> mementos = new ArrayList<>();
 
-  private String retryLegalName;
-  private ServerKubernetesObjects retryInstance;
-
-  @Rule
-  public TestWatcher watcher =
-      new TestWatcher() {
-        @Override
-        protected void failed(Throwable e, Description description) {
-          super.failed(e, description);
-          System.out.println("Tell Russell\n" + DomainPresenceMonitor.getExplanation());
-          Map<String, ServerKubernetesObjects> returnedMap =
-              ServerKubernetesObjectsManager.getServerKubernetesObjects();
-
-          System.out.printf(
-              "\nObject in map with key %s is %s, which compares %b",
-              retryLegalName,
-              returnedMap.get(retryLegalName),
-              retryInstance == returnedMap.get(retryLegalName));
-        }
-      };
-
   @Before
   public void setUp() throws Exception {
     mementos.add(TestUtils.silenceOperatorLogger());
@@ -66,8 +37,6 @@ public void setUp() throws Exception {
     mementos.add(
         StaticStubSupport.install(
             ServerKubernetesObjectsManager.class, "serverMap", new ConcurrentHashMap<>()));
-    ServerKubernetesObjectsManager.clear();
-    DomainPresenceMonitor.clear();
   }
 
   @After
@@ -87,7 +56,6 @@ public void whenNoPreexistingDomains_createEmptyServerKubernetesObjectsMap() {
   }
 
   @Test
-  @Intermittent(repetition = 10)
   public void whenK8sHasDomainWithOneServer_canLookupFromServerKubernetesObjectsFactory() {
     Domain domain = createDomain("UID1", "ns1");
     DomainPresenceInfo info = DomainPresenceInfoManager.getOrCreate(domain);
@@ -96,11 +64,11 @@ public void whenK8sHasDomainWithOneServer_canLookupFromServerKubernetesObjectsFa
 
     assertThat(info.getServers(), hasEntry(equalTo("admin"), sameInstance(sko)));
 
-    retryLegalName = LegalNames.toServerName("UID1", "admin");
-    retryInstance = sko;
-    assertThat(
-        ServerKubernetesObjectsManager.getServerKubernetesObjects(),
-        hasEntry(equalTo(LegalNames.toServerName("UID1", "admin")), sameInstance(sko)));
+    /*
+        assertThat(
+            ServerKubernetesObjectsManager.getServerKubernetesObjects(),
+            hasEntry(equalTo(LegalNames.toServerName("UID1", "admin")), sameInstance(sko)));
+    */
   }
 
   @Test