add YAMLSTYLEINGRESS LB ingress

Author: [email protected]

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. |
+| YAMLSTYLEINGRESS  | When set to "true", LB's ingress will be created by kubectl yaml file. |
 | 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 YAMLSTYLEINGRESS;
 
   // 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 YAMLSTYLEINGRESS to true 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();
     }
+    YAMLSTYLEINGRESS =
+        System.getenv("YAMLSTYLEINGRESS") != null
+            && System.getenv("YAMLSTYLEINGRESS").equalsIgnoreCase("true");
   }
 
   /**
@@ -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 (YAMLSTYLEINGRESS) {
+        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 (YAMLSTYLEINGRESS) {
+        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);