Skip to content

Commit 96118e6

Browse files
address the review comments
1 parent 7f32d91 commit 96118e6

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class Domain {
5555
private int loadBalancerWebPort = 30305;
5656
private String userProjectsDir = "";
5757
private String projectRoot = "";
58-
private boolean ingressPerDomain;
58+
private boolean ingressPerDomain = false;
5959

6060
private String createDomainScript = "";
6161
private String inputTemplateFile = "";
@@ -818,10 +818,14 @@ private void createLoadBalancer() throws Exception {
818818
lbMap.put("host", domainUid + ".org");
819819
lbMap.put("serviceName", domainUid + "-cluster-" + domainMap.get("clusterName"));
820820
lbMap.put("loadBalancer", domainMap.getOrDefault("loadBalancer", loadBalancer));
821-
lbMap.put("ingressPerDomain", ingressPerDomain);
821+
lbMap.put("ingressPerDomain", domainMap.getOrDefault("ingressPerDomain", ingressPerDomain));
822822
lbMap.put("clusterName", domainMap.get("clusterName"));
823823

824824
loadBalancer = (String) lbMap.get("loadBalancer");
825+
ingressPerDomain = ((Boolean) domainMap.get("ingressPerDomain")).booleanValue();
826+
logger.info("Forr this domain loadBalancer is: " + loadBalaner
827+
+ " ingressPerDomain is: " + ingressPerDomain);
828+
825829

826830
if (loadBalancer.equals("TRAEFIK") && !ingressPerDomain) {
827831
lbMap.put("name", "traefik-hostrouting-" + domainUid);
@@ -994,11 +998,13 @@ private void initialize(String inputYaml) throws Exception {
994998
clusterName = (String) domainMap.get("clusterName");
995999
clusterType = (String) domainMap.get("clusterType");
9961000
serverStartPolicy = (String) domainMap.get("serverStartPolicy");
1001+
/*
9971002
if (domainMap.containsKey("ingressPerDomain")) {
9981003
ingressPerDomain = ((Boolean) domainMap.get("ingressPerDomain")).booleanValue();
9991004
}
10001005
10011006
logger.info("ingressPerDomain for this domain is: " + ingressPerDomain);
1007+
*/
10021008

10031009
if (exposeAdminT3Channel) {
10041010
domainMap.put("t3PublicAddress", TestUtils.getHostName());

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,13 @@ public LoadBalancer(Map lbMap) throws Exception {
3636

3737
if (lbMap.get("ingressPerDomain") == null
3838
|| !((Boolean) lbMap.get("ingressPerDomain")).booleanValue()) {
39-
if (lbMap.get("loadBalancer").equals("TRAEFIK")) {
40-
logger.info("Is going to createTraefikHostRouting");
39+
logger.info("Is going to createTraefikHostRouting");
4140
createTraefikHostRouting();
42-
}
4341
}
4442

4543
if (lbMap.get("ingressPerDomain") != null
46-
&& ((Boolean) lbMap.get("ingressPerDomain")).booleanValue())
47-
if (lbMap.get("loadBalancer").equals("TRAEFIK")) {
48-
logger.info("Is going to createTraefikIngressPerDomain");
44+
&& ((Boolean) lbMap.get("ingressPerDomain")).booleanValue()){
45+
logger.info("Is going to createTraefikIngressPerDomain");
4946
createTraefikIngressPerDomain();
5047
}
5148
}

0 commit comments

Comments
 (0)