merge from develop

Author: russgold

docs/domains/Domain.json

@@ -177,7 +177,7 @@
           ]
         },
         "image": {
-          "description": "The Weblogic Docker image; required when domainHomeInImage is true; otherwise, defaults to store/oracle/weblogic:12.2.1.3.",
+          "description": "The WebLogic Docker image; required when domainHomeInImage is true; otherwise, defaults to store/oracle/weblogic:12.2.1.3.",
           "type": "string"
         },
         "imagePullPolicy": {
@@ -239,7 +239,7 @@
           "$ref": "#/definitions/KubernetesResource"
         },
         "domainHome": {
-          "description": "The folder for the Weblogic Domain. Not required. Defaults to /shared/domains/domains/domainUID if domainHomeInImage is false Defaults to /u01/oracle/user_projects/domains/ if domainHomeInImage is true",
+          "description": "The folder for the WebLogic Domain. Not required. Defaults to /shared/domains/domains/domainUID if domainHomeInImage is false Defaults to /u01/oracle/user_projects/domains/ if domainHomeInImage is true",
           "type": "string"
         },
         "logHomeEnabled": {

docs/domains/Domain.md

@@ -20,10 +20,10 @@ DomainSpec is a description of a domain.
 | clusters | array of [Cluster](#cluster) | Configuration for the clusters. |
 | configOverrides | string | The name of the config map for optional WebLogic configuration overrides. |
 | configOverrideSecrets | array of string | A list of names of the secrets for optional WebLogic configuration overrides. |
-| domainHome | string | The folder for the Weblogic Domain. Not required. Defaults to /shared/domains/domains/domainUID if domainHomeInImage is false Defaults to /u01/oracle/user_projects/domains/ if domainHomeInImage is true |
+| domainHome | string | The folder for the WebLogic Domain. Not required. Defaults to /shared/domains/domains/domainUID if domainHomeInImage is false Defaults to /u01/oracle/user_projects/domains/ if domainHomeInImage is true |
 | domainHomeInImage | boolean | True if this domain's home is defined in the docker image for the domain. Defaults to true. |
 | domainUID | string | Domain unique identifier. Must be unique across the Kubernetes cluster. Not required. Defaults to the value of metadata.name |
-| image | string | The Weblogic Docker image; required when domainHomeInImage is true; otherwise, defaults to store/oracle/weblogic:12.2.1.3. |
+| image | string | The WebLogic Docker image; required when domainHomeInImage is true; otherwise, defaults to store/oracle/weblogic:12.2.1.3. |
 | imagePullPolicy | string | The image pull policy for the WebLogic Docker image. Legal values are Always, Never and IfNotPresent. Defaults to Always if image ends in :latest, IfNotPresent otherwise. |
 | imagePullSecrets | array of [Local Object Reference](k8s1.9.0.md#local-object-reference) | A list of image pull secrets for the WebLogic Docker image. |
 | includeServerOutInPodLog | boolean | If true (the default), the server .out file will be included in the pod's stdout. |

docs/domains/index.html

@@ -1097,7 +1097,7 @@
           ]
         },
         "image": {
-          "description": "The Weblogic Docker image; required when domainHomeInImage is true; otherwise, defaults to store/oracle/weblogic:12.2.1.3.",
+          "description": "The WebLogic Docker image; required when domainHomeInImage is true; otherwise, defaults to store/oracle/weblogic:12.2.1.3.",
           "type": "string"
         },
         "imagePullPolicy": {
@@ -1159,7 +1159,7 @@
           "$ref": "#/definitions/KubernetesResource"
         },
         "domainHome": {
-          "description": "The folder for the Weblogic Domain. Not required. Defaults to /shared/domains/domains/domainUID if domainHomeInImage is false Defaults to /u01/oracle/user_projects/domains/ if domainHomeInImage is true",
+          "description": "The folder for the WebLogic Domain. Not required. Defaults to /shared/domains/domains/domainUID if domainHomeInImage is false Defaults to /u01/oracle/user_projects/domains/ if domainHomeInImage is true",
           "type": "string"
         },
         "logHomeEnabled": {

integration-tests/README.md

@@ -204,6 +204,7 @@ The tests accepts optional env var overrides:
 | RESULT_ROOT | The root directory to use for the tests temporary files. See "Directory Configuration and Structure" for                  defaults and a detailed description of test directories. |
 | PV_ROOT    |  The root directory on the kubernetes cluster used for persistent volumes. See "Directory Configuration and Structure" for defaults and a detailed description of test directories. |
 | QUICKTEST  | When set to "true", limits testing to a subset of the tests. |
+| INGRESSPERDOMAIN  | The defult value is true. If you want to test creating LB by kubectl yaml for multiple domains, set it to false. |
 | WERCKER    | Set to true if invoking from Wercker, set to false or "" if running stand-alone or from Jenkins. Default is "". |
 | JENKINS    | Set to true if invoking from Jenkins, set to false or "" if running stand-alone or from Wercker. Default is "". |
 | NODEPORT_HOST | DNS name of a Kubernetes worker node. Default is the local host's hostname. |

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

@@ -54,10 +54,12 @@ public class ITOperator extends BaseTest {
   private static boolean QUICKTEST;
   private static boolean SMOKETEST;
   private static boolean JENKINS;
+  private static boolean INGRESSPERDOMAIN = true;
 
   // Set QUICKTEST env var to true to run a small subset of tests.
   // Set SMOKETEST env var to true to run an even smaller subset
   // of tests, plus leave domain1 up and running when the test completes.
+  // set INGRESSPERDOMAIN to false to create LB's ingress by kubectl yaml file
   static {
     QUICKTEST =
         System.getenv("QUICKTEST") != null && System.getenv("QUICKTEST").equalsIgnoreCase("true");
@@ -67,6 +69,9 @@ public class ITOperator extends BaseTest {
     if (System.getenv("JENKINS") != null) {
       JENKINS = new Boolean(System.getenv("JENKINS")).booleanValue();
     }
+    if (System.getenv("INGRESSPERDOMAIN") != null) {
+      INGRESSPERDOMAIN = new Boolean(System.getenv("INGRESSPERDOMAIN")).booleanValue();
+    }
   }
 
   /**
@@ -231,6 +236,12 @@ public void testTwoDomainsManagedByTwoOperators() throws Exception {
       wlstDomainMap.put("domainUID", "domain1onpvwlst");
       wlstDomainMap.put("adminNodePort", new Integer("30702"));
       wlstDomainMap.put("t3ChannelPort", new Integer("30031"));
+      if (!INGRESSPERDOMAIN) {
+        wlstDomainMap.put("ingressPerDomain", new Boolean("false"));
+        logger.info(
+            "domain1onpvwlst ingressPerDomain is set to: "
+                + ((Boolean) wlstDomainMap.get("ingressPerDomain")).booleanValue());
+      }
       domain1 = TestUtils.createDomain(wlstDomainMap);
       domain1.verifyDomainCreated();
       testBasicUseCases(domain1);
@@ -246,6 +257,12 @@ public void testTwoDomainsManagedByTwoOperators() throws Exception {
       wdtDomainMap.put("adminNodePort", new Integer("30703"));
       wdtDomainMap.put("t3ChannelPort", new Integer("30041"));
       // wdtDomainMap.put("clusterType", "Configured");
+      if (!INGRESSPERDOMAIN) {
+        wdtDomainMap.put("ingressPerDomain", new Boolean("false"));
+        logger.info(
+            "domain2onpvwdt ingressPerDomain is set to: "
+                + ((Boolean) wdtDomainMap.get("ingressPerDomain")).booleanValue());
+      }
       domain2 = TestUtils.createDomain(wdtDomainMap);
       domain2.verifyDomainCreated();
       testBasicUseCases(domain2);

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

@@ -55,6 +55,7 @@ public class Domain {
   private int loadBalancerWebPort = 30305;
   private String userProjectsDir = "";
   private String projectRoot = "";
+  private boolean ingressPerDomain = false;
 
   private String createDomainScript = "";
   private String inputTemplateFile = "";
@@ -803,14 +804,29 @@ private void callCreateDomainScript(String outputDir) throws Exception {
 
   private void createLoadBalancer() throws Exception {
     Map<String, Object> lbMap = new HashMap<String, Object>();
-    lbMap.put("name", "traefik-hostrouting-" + domainUid);
     lbMap.put("domainUID", domainUid);
     lbMap.put("namespace", domainNS);
     lbMap.put("host", domainUid + ".org");
     lbMap.put("serviceName", domainUid + "-cluster-" + domainMap.get("clusterName"));
     lbMap.put("loadBalancer", domainMap.getOrDefault("loadBalancer", loadBalancer));
+    lbMap.put("ingressPerDomain", domainMap.getOrDefault("ingressPerDomain", ingressPerDomain));
+    lbMap.put("clusterName", domainMap.get("clusterName"));
 
     loadBalancer = (String) lbMap.get("loadBalancer");
+    ingressPerDomain = ((Boolean) lbMap.get("ingressPerDomain")).booleanValue();
+    logger.info(
+        "For this domain loadBalancer is: "
+            + loadBalancer
+            + " ingressPerDomain is: "
+            + ingressPerDomain);
+
+    if (loadBalancer.equals("TRAEFIK") && !ingressPerDomain) {
+      lbMap.put("name", "traefik-hostrouting-" + domainUid);
+    }
+
+    if (loadBalancer.equals("TRAEFIK") && ingressPerDomain) {
+      lbMap.put("name", "traefik-ingress-" + domainUid);
+    }
 
     if (loadBalancer.equals("APACHE")) {
       /* lbMap.put("loadBalancerAppPrepath", "/weblogic");

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

@@ -33,7 +33,14 @@ public LoadBalancer(Map lbMap) throws Exception {
       if (result.exitValue() != 0) {
         createTraefikLoadBalancer();
       }
-      createTraefikHostRouting();
+
+      if (!((Boolean) lbMap.get("ingressPerDomain")).booleanValue()) {
+        logger.info("Is going to createTraefikHostRouting");
+        createTraefikHostRouting();
+      } else {
+        logger.info("Is going to createTraefikIngressPerDomain");
+        createTraefikIngressPerDomain();
+      }
     }
   }
 
@@ -84,6 +91,76 @@ public void createTraefikHostRouting() throws Exception {
     }
   }
 
+  private void createTraefikIngressPerDomain() throws Exception {
+    upgradeTraefikNamespace();
+    createTraefikIngress();
+  }
+
+  private void upgradeTraefikNamespace() throws Exception {
+
+    StringBuffer cmd = new StringBuffer("helm upgrade ");
+    cmd.append("--reuse-values ")
+        .append("--set ")
+        .append("\"")
+        .append("kubernetes.namespaces={traefik,")
+        .append(lbMap.get("namespace"))
+        .append("}")
+        .append("\"")
+        .append(" traefik-operator")
+        .append(" stable/traefik ");
+
+    logger.info(" upgradeTraefikNamespace() Running " + cmd.toString());
+    ExecResult result = ExecCommand.exec(cmd.toString());
+    if (result.exitValue() != 0) {
+      reportHelmInstallFailure(cmd.toString(), result);
+    }
+    String outputStr = result.stdout().trim();
+    logger.info("Command returned " + outputStr);
+  }
+
+  private void createTraefikIngress() throws Exception {
+
+    String chartDir = BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/charts";
+
+    StringBuffer cmd = new StringBuffer("cd ");
+    cmd.append(chartDir).append(" && helm install ingress-per-domain ");
+    cmd.append(" --name ")
+        .append(lbMap.get("name"))
+        .append(" --namespace ")
+        .append(lbMap.get("namespace"))
+        .append(" --set ")
+        .append("wlsDomain.domainUID=")
+        .append(lbMap.get("domainUID"))
+        .append(" --set ")
+        .append("wlsDomain.clusterName=")
+        .append(lbMap.get("clusterName"))
+        .append(" --set ")
+        .append("traefik.hostname=")
+        .append(lbMap.get("domainUID"))
+        .append(".org");
+
+    logger.info("createTraefikIngress() Running " + cmd.toString());
+    ExecResult result = ExecCommand.exec(cmd.toString());
+    if (result.exitValue() != 0) {
+      reportHelmInstallFailure(cmd.toString(), result);
+    }
+    String outputStr = result.stdout().trim();
+    logger.info("Command returned " + outputStr);
+  }
+
+  private void reportHelmInstallFailure(String cmd, ExecResult result) throws Exception {
+    throw new RuntimeException(getExecFailure(cmd, result));
+  }
+
+  private String getExecFailure(String cmd, ExecResult result) throws Exception {
+    return "FAILURE: command "
+        + cmd
+        + " failed, stdout:\n"
+        + result.stdout()
+        + "stderr:\n"
+        + result.stderr();
+  }
+
   public Map<String, Object> getLBMap() {
     return lbMap;
   }

integration-tests/src/test/resources/charts/ingress-per-domain/Chart.yaml

@@ -0,0 +1,8 @@
+# Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart to create an Ingress for a WLS domain. 
+name: ingress-per-domain
+version: 0.1.0

integration-tests/src/test/resources/charts/ingress-per-domain/templates/traefik-ingress.yaml

@@ -0,0 +1,24 @@
+# Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+
+{{- if eq .Values.type "TRAEFIK" }}
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ .Values.wlsDomain.domainUID }}-traefik
+  namespace: {{ .Release.Namespace }}
+  labels:
+    weblogic.resourceVersion: domain-v2
+spec:
+  annotations:
+    kubernetes.io/ingress.class: traefik
+  rules:
+  - host: '{{ .Values.traefik.hostname }}'
+    http:
+      paths:
+      - path:
+        backend:
+          serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.clusterName | lower | replace "_" "-" }}'
+          servicePort: {{ .Values.wlsDomain.managedServerPort }}
+{{- end }}

integration-tests/src/test/resources/charts/ingress-per-domain/templates/voyager-ingress.yaml

@@ -0,0 +1,46 @@
+# Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+
+{{- if eq .Values.type "VOYAGER" }}
+---
+apiVersion: voyager.appscode.com/v1beta1
+kind: Ingress
+metadata:
+  name: {{ .Values.wlsDomain.domainUID }}-voyager
+  namespace: {{ .Release.Namespace }}
+  labels:
+    weblogic.resourceVersion: domain-v2
+  annotations:
+    ingress.appscode.com/type: 'NodePort'
+    ingress.appscode.com/stats: 'true'
+    ingress.appscode.com/affinity: 'cookie'
+spec:
+  rules:
+  - host: '*'
+    http:
+      nodePort: '{{ .Values.voyager.webPort }}'
+      paths:
+      - backend:
+          serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.clusterName | lower | replace "_" "-" }}'
+          servicePort: '{{ .Values.wlsDomain.managedServerPort }}'
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.wlsDomain.domainUID }}-voyager-stats
+  namespace: {{ .Release.Namespace }}
+  labels:
+    weblogic.resourceVersion: domain-v2
+spec:
+  type: NodePort
+  ports:
+    - name: client
+      protocol: TCP
+      port: 56789
+      targetPort: 56789
+      nodePort: {{ .Values.voyager.statsPort }}
+  selector:
+    origin: voyager
+    origin-name: {{ .Values.wlsDomain.domainUID }}-voyager
+{{- end }}