address review comments

Author: [email protected]

integration-tests/README.md

@@ -204,7 +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. |
+| 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,12 +54,12 @@ public class ITOperator extends BaseTest {
   private static boolean QUICKTEST;
   private static boolean SMOKETEST;
   private static boolean JENKINS;
-  private static boolean YAMLSTYLEINGRESS;
+  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 YAMLSTYLEINGRESS to true to create LB's ingress by kubectl yaml file
+  // set INGRESSPERDOMAIN to false to create LB's ingress by kubectl yaml file
   static {
     QUICKTEST =
         System.getenv("QUICKTEST") != null && System.getenv("QUICKTEST").equalsIgnoreCase("true");
@@ -69,9 +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");
+    INGRESSPERDOMAIN =
+        System.getenv("INGRESSPERDOMAIN") != null
+            && System.getenv("INGRESSPERDOMAIN").equalsIgnoreCase("false");
   }
 
   /**
@@ -236,7 +236,7 @@ public void testTwoDomainsManagedByTwoOperators() throws Exception {
       wlstDomainMap.put("domainUID", "domain1onpvwlst");
       wlstDomainMap.put("adminNodePort", new Integer("30702"));
       wlstDomainMap.put("t3ChannelPort", new Integer("30031"));
-      if (YAMLSTYLEINGRESS) {
+      if (!INGRESSPERDOMAIN) {
         wlstDomainMap.put("ingressPerDomain", new Boolean("false"));
         logger.info(
             "domain1onpvwlst ingressPerDomain is set to: "
@@ -257,7 +257,7 @@ public void testTwoDomainsManagedByTwoOperators() throws Exception {
       wdtDomainMap.put("adminNodePort", new Integer("30703"));
       wdtDomainMap.put("t3ChannelPort", new Integer("30041"));
       // wdtDomainMap.put("clusterType", "Configured");
-      if (YAMLSTYLEINGRESS) {
+      if (!INGRESSPERDOMAIN) {
         wdtDomainMap.put("ingressPerDomain", new Boolean("false"));
         logger.info(
             "domain2onpvwdt ingressPerDomain is set to: "

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

@@ -804,7 +804,6 @@ 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");

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

@@ -100,8 +100,6 @@ private void upgradeTraefikNamespace() throws Exception {
 
     String chartDir = BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/charts";
 
-    // StringBuffer cmd = new StringBuffer("cd ");
-    // cmd.append(chartDir).append(" && helm upgrade ");
     StringBuffer cmd = new StringBuffer("helm upgrade ");
     cmd.append("--reuse-values ")
         .append("--set ")