Merge branch 'domain-introspector' into domain-introspector-OWLS-69881

Author: jgrundback

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.");

model/src/main/java/oracle/kubernetes/weblogic/domain/ClusterConfigurator.java

@@ -39,4 +39,8 @@ ClusterConfigurator withLivenessProbeSettings(
   ClusterConfigurator withAdditionalVolume(String name, String path);
 
   ClusterConfigurator withAdditionalVolumeMount(String name, String path);
+
+  ClusterConfigurator withPodLabel(String name, String value);
+
+  ClusterConfigurator withPodAnnotation(String name, String value);
 }

model/src/main/java/oracle/kubernetes/weblogic/domain/DomainConfigurator.java

@@ -232,6 +232,10 @@ protected String getAsName() {
 
   public abstract DomainConfigurator withAdditionalVolumeMount(String name, String path);
 
+  public abstract DomainConfigurator withPodLabel(String name, String value);
+
+  public abstract DomainConfigurator withPodAnnotation(String name, String value);
+
   /**
    * Adds a default server configuration to the domain, if not already present.
    *

model/src/main/java/oracle/kubernetes/weblogic/domain/ServerConfigurator.java

@@ -37,4 +37,8 @@ ServerConfigurator withReadinessProbeSettings(
   ServerConfigurator withAdditionalVolume(String name, String path);
 
   ServerConfigurator withAdditionalVolumeMount(String name, String path);
+
+  ServerConfigurator withPodLabel(String name, String value);
+
+  ServerConfigurator withPodAnnotation(String name, String value);
 }

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/BaseConfiguration.java

@@ -178,6 +178,22 @@ void addAdditionalVolumeMount(String name, String path) {
     serverPod.addAdditionalVolumeMount(name, path);
   }
 
+  public Map<String, String> getPodLabels() {
+    return serverPod.getPodLabels();
+  }
+
+  void addPodLabels(String name, String value) {
+    serverPod.addPodLabel(name, value);
+  }
+
+  public Map<String, String> getPodAnnotations() {
+    return serverPod.getPodAnnotations();
+  }
+
+  void addPodAnnotations(String name, String value) {
+    serverPod.addPodAnnotations(name, value);
+  }
+
   @Override
   public String toString() {
     return new ToStringBuilder(this)

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/Domain.java

@@ -387,6 +387,24 @@ public V1PersistentVolumeClaim getRequiredPersistentVolumeClaim() {
         : spec.getStorage().getRequiredPersistentVolumeClaim(getDomainUID(), getNamespace());
   }
 
+  /**
+   * Returns the name of the Kubernetes configmap that contains optional configuration overrides.
+   *
+   * @return name of the configmap
+   */
+  public String getConfigOverrides() {
+    return spec.getConfigOverrides();
+  }
+
+  /**
+   * Returns a list of Kubernetes secret names used in optional configuration overrides.
+   *
+   * @return list of Kubernetes secret names
+   */
+  public List<String> getConfigOverrideSecrets() {
+    return spec.getConfigOverrideSecrets();
+  }
+
   private String getNamespace() {
     return getMetadata().getNamespace();
   }

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainSpec.java

@@ -169,7 +169,7 @@ public class DomainSpec extends BaseConfiguration {
   private DomainStorage storage;
 
   /**
-   * The name of the Kubernetes configmap used in the WebLogic Configuration overrides.
+   * The name of the Kubernetes configmap used for optional WebLogic configuration overrides.
    *
    * @since 2.0
    */
@@ -179,7 +179,7 @@ public class DomainSpec extends BaseConfiguration {
   private String configOverrides;
 
   /**
-   * The list of names of the Kubernetes secrets used in the WebLogic Configuration overrides.
+   * A list of names of the Kubernetes secrets used in the WebLogic Configuration overrides.
    *
    * @since 2.0
    */
@@ -576,6 +576,11 @@ public void setConfigOverrides(@Nullable String overridess) {
     this.configOverrides = overridess;
   }
 
+  public DomainSpec withConfigOverrides(@Nullable String overridess) {
+    this.configOverrides = overridess;
+    return this;
+  }
+
   private boolean hasConfigOverrideSecrets() {
     return configOverrideSecrets != null && configOverrideSecrets.size() != 0;
   }
@@ -590,6 +595,11 @@ public void setConfigOverrideSecrets(@Nullable List<String> overridesSecretNames
     this.configOverrideSecrets = overridesSecretNames;
   }
 
+  public DomainSpec withConfigOverrideSecrets(@Nullable List<String> overridesSecretNames) {
+    this.configOverrideSecrets = overridesSecretNames;
+    return this;
+  }
+
   /**
    * Returns the name of the persistent volume claim for the logs and PV-based domain.
    *

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainV2Configurator.java

@@ -103,6 +103,18 @@ public DomainConfigurator withConfigOverrideSecrets(String... secretNames) {
     return this;
   }
 
+  @Override
+  public DomainConfigurator withPodLabel(String name, String value) {
+    ((BaseConfiguration) getDomainSpec()).addPodLabels(name, value);
+    return this;
+  }
+
+  @Override
+  public DomainConfigurator withPodAnnotation(String name, String value) {
+    ((BaseConfiguration) getDomainSpec()).addPodAnnotations(name, value);
+    return this;
+  }
+
   class AdminServerConfiguratorImpl extends ServerConfiguratorImpl
       implements AdminServerConfigurator {
     private AdminServer adminServer;
@@ -280,6 +292,18 @@ public ServerConfigurator withAdditionalVolumeMount(String name, String path) {
       server.addAdditionalVolumeMount(name, path);
       return this;
     }
+
+    @Override
+    public ServerConfigurator withPodLabel(String name, String value) {
+      server.addPodLabels(name, value);
+      return this;
+    }
+
+    @Override
+    public ServerConfigurator withPodAnnotation(String name, String value) {
+      server.addPodAnnotations(name, value);
+      return this;
+    }
   }
 
   @Override
@@ -400,5 +424,17 @@ public ClusterConfigurator withAdditionalVolumeMount(String name, String path) {
       cluster.addAdditionalVolumeMount(name, path);
       return this;
     }
+
+    @Override
+    public ClusterConfigurator withPodLabel(String name, String value) {
+      cluster.addPodLabels(name, value);
+      return this;
+    }
+
+    @Override
+    public ClusterConfigurator withPodAnnotation(String name, String value) {
+      cluster.addPodAnnotations(name, value);
+      return this;
+    }
   }
 }