Skip to content

Commit f20744d

Browse files
author
MAGGIE.HE@ORACLE.COM
committed
make voyager webport unique and fix NPE
1 parent 397bb1a commit f20744d

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1101,7 +1101,10 @@ private void createLoadBalancer() throws Exception {
11011101
lbMap.put("serviceName", domainUid + "-cluster-" + domainMap.get("clusterName"));
11021102
if (voyager) {
11031103
lbMap.put("loadBalancer", "VOYAGER");
1104-
lbMap.put("loadBalancerWebPort", domainMap.get("voyagerWebPort"));
1104+
//lbMap.put("loadBalancerWebPort", domainMap.get("voyagerWebPort"));
1105+
lbMap.put(
1106+
"loadBalancerWebPort",
1107+
domainMap.getOrDefault("voyagerWebPort", new Integer(loadBalancerWebPort)));
11051108
} else {
11061109
lbMap.put("loadBalancer", domainMap.getOrDefault("loadBalancer", loadBalancer));
11071110
lbMap.put(

integration-tests/src/test/resources/domaininimagewdt.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ configuredManagedServerCount: 4
77
initialManagedServerReplicas: 2
88
exposeAdminT3Channel: true
99
exposeAdminNodePort: true
10+
voyagerWebPort: 30333
1011
domainHomeImageBuildPath: ./docker-images/OracleWebLogic/samples/12213-domain-home-in-image-wdt
1112
domainHomeImageBase: "store/oracle/weblogic:12.2.1.3"
1213
logHomeOnPV: true

integration-tests/src/test/resources/domaininimagewlst.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ configuredManagedServerCount: 4
77
initialManagedServerReplicas: 2
88
exposeAdminT3Channel: true
99
exposeAdminNodePort: true
10+
voyagerWebPort: 30322
1011
domainHomeImageBuildPath: ./docker-images/OracleWebLogic/samples/12213-domain-home-in-image
1112
domainHomeImageBase: "store/oracle/weblogic:12.2.1.3"
1213
logHomeOnPV: true

0 commit comments

Comments
 (0)