Merge remote-tracking branch 'origin/develop' into java-integ-ingress-per-domain

merge to the latest develop branch

Author: MAGGIE.HE@ORACLE.COM

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

@@ -213,7 +213,7 @@ public void verifyAdminServerExternalService(String username, String password) t
 
     // logger.info("Inside verifyAdminServerExternalService");
     if (exposeAdminNodePort) {
-      String nodePortHost = TestUtils.getHostName();
+      String nodePortHost = getHostNameForCurl();
       String nodePort = getNodePort();
       logger.info("nodePortHost " + nodePortHost + " nodePort " + nodePort);
 
@@ -364,11 +364,7 @@ public void callWebAppAndVerifyLoadBalancing(String webappName, boolean verifyLo
     if (!loadBalancer.equals("NONE")) {
       // url
       StringBuffer testAppUrl = new StringBuffer("http://");
-      testAppUrl
-          .append(TestUtils.getHostName())
-          .append(":")
-          .append(loadBalancerWebPort)
-          .append("/");
+      testAppUrl.append(getHostNameForCurl()).append(":").append(loadBalancerWebPort).append("/");
       if (loadBalancer.equals("APACHE")) {
         testAppUrl.append("weblogic/");
       }
@@ -600,7 +596,7 @@ public void verifyAdminConsoleViaLB() throws Exception {
       logger.info("This check is done only for APACHE load balancer");
       return;
     }
-    String nodePortHost = TestUtils.getHostName();
+    String nodePortHost = getHostNameForCurl();
     int nodePort = getAdminSericeLBNodePort();
     String responseBodyFile =
         userProjectsDir + "/weblogic-domains/" + domainUid + "/testconsole.response.body";
@@ -1129,4 +1125,25 @@ private String getNodePort() throws Exception {
               + "for the admin server in domain.");
     }
   }
+
+  private String getHostNameForCurl() throws Exception {
+    if (System.getenv("K8S_NODEPORT_HOST") != null) {
+      return System.getenv("K8S_NODEPORT_HOST");
+    } else {
+      // ExecResult result = ExecCommand.exec("hostname | awk -F. '{print $1}'");
+      ExecResult result1 =
+          ExecCommand.exec("kubectl get nodes -o=jsonpath='{range .items[0]}{.metadata.name}'");
+      if (result1.exitValue() != 0) {
+        throw new RuntimeException("FAILURE: Could not get K8s Node name");
+      }
+      ExecResult result2 =
+          ExecCommand.exec(
+              "nslookup " + result1.stdout() + " | grep \"^Name\" | awk '{ print $2 }'");
+      if (result2.stdout().trim().equals("")) {
+        return result1.stdout().trim();
+      } else {
+        return result2.stdout().trim();
+      }
+    }
+  }
 }

kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml

@@ -47,7 +47,7 @@ productionModeEnabled: true
 # If this property is set, the create domain scripts will use the value specified, instead of the
 # default value, to tag the generated image and set the `image` in the domain YAML file.
 #
-# An unique value is required for each domain that is created using the scripts.
+# A unique value is required for each domain that is created using the scripts.
 #
 # If you are running the sample scripts from a machine that is remote to the Kubernetes cluster where
 # the domain is going to be running, you need to set this property to the image name that is intended

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/README.md

@@ -10,7 +10,7 @@ The following prerequisites must be handled prior to running the create domain s
 * Make sure the WebLogic operator is running.
 * The operator requires WebLogic Server 12.2.1.3.0 with patch 29135930 applied. The existing WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, was updated on January 17, 2019, and has all the necessary patches applied; a `docker pull` is required if you pulled the image prior to that date. Refer to [WebLogic Docker images](../../../../../site/weblogic-docker-images.md) for details on how to obtain or create the image.
 * Create a Kubernetes namespace for the domain unless the intention is to use the default namespace.
-* In the same Kubernetes namespace, create the Kubernetes persistent volume where the domain home will be hosted, and the Kubernetes persistent volume claim for the domain. For samples to create a PV and PVC, see [Create sample PV and PVC](../../create-weblogic-domain-pv-pvc/README.md).
+* In the same Kubernetes namespace, create the Kubernetes persistent volume (PV) where the domain home will be hosted, and the Kubernetes persistent volume claim (PVC) for the domain. For samples to create a PV and PVC, see [Create sample PV and PVC](../../create-weblogic-domain-pv-pvc/README.md). By default, the `create-domain.sh` script creates a domain with the `domainUID` set to `domain1` and expects the PVC `domain1-weblogic-sample-pvc` to be present. You can create `domain1-weblogic-sample-pvc` using [create-pv-pvc.sh](../../create-weblogic-domain-pv-pvc/create-pv-pvc.sh) with an inputs file that has the `domainUID` set to `domain1`.
 * Create the Kubernetes secrets `username` and `password` of the admin account in the same Kubernetes namespace as the domain.
 
 ## Use the script to create a domain

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

@@ -69,7 +69,7 @@ public abstract class PodStepContext extends StepContextBase {
   private static final String START_SERVER = "/weblogic-operator/scripts/startServer.sh";
   private static final String LIVENESS_PROBE = "/weblogic-operator/scripts/livenessProbe.sh";
 
-  private static final String READINESS_PATH = "/weblogic/";
+  private static final String READINESS_PATH = "/weblogic/ready";
 
   private final DomainPresenceInfo info;
   private final WlsDomainConfig domainTopology;

operator/src/test/java/oracle/kubernetes/operator/helpers/PodHelperTestBase.java

@@ -278,7 +278,7 @@ public void whenPodCreated_livenessProbeHasDefinedTuning() {
   @Test
   public void whenPodCreated_readinessProbeHasReadinessCommand() {
     V1HTTPGetAction getAction = getCreatedPodSpecContainer().getReadinessProbe().getHttpGet();
-    assertThat(getAction.getPath(), equalTo("/weblogic/"));
+    assertThat(getAction.getPath(), equalTo("/weblogic/ready"));
     assertThat(getAction.getPort().getIntValue(), equalTo(listenPort));
   }