Leave clusterIP blank for NodePort

rjeberhard · rjeberhard · commit 21f9663b2961 · 2018-06-26T09:51:21.000-04:00
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/ServiceHelper.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/ServiceHelper.java
@@ -97,7 +97,9 @@ protected V1ServiceSpec createServiceSpec() {
       if (isPublishNotReadyAddressesSupported()) {
         serviceSpec.setPublishNotReadyAddresses(Boolean.TRUE);
       }
-      serviceSpec.clusterIP("None");
+      if (nodePort == null) {
+        serviceSpec.clusterIP("None");
+      }
       return serviceSpec;
     }
 
diff --git a/operator/src/test/java/oracle/kubernetes/operator/helpers/ServiceHelperTest.java b/operator/src/test/java/oracle/kubernetes/operator/helpers/ServiceHelperTest.java
@@ -442,7 +442,7 @@ public void whenNodePortSpecified_createServerServiceWithNodePort() {
   }
 
   private V1Service withNodePort(V1Service service, int nodePort) {
-    service.getSpec().setType("NodePort");
+    service.getSpec().type("NodePort").clusterIP(null);
     service
         .getSpec()
         .getPorts()

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,9 @@ protected V1ServiceSpec createServiceSpec() {`
`97`	`97`	`if (isPublishNotReadyAddressesSupported()) {`
`98`	`98`	`serviceSpec.setPublishNotReadyAddresses(Boolean.TRUE);`
`99`	`99`	`}`
`100`		`- serviceSpec.clusterIP("None");`
	`100`	`+ if (nodePort == null) {`
	`101`	`+ serviceSpec.clusterIP("None");`
	`102`	`+ }`
`101`	`103`	`return serviceSpec;`
`102`	`104`	`}`
`103`	`105`
Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,7 @@ public void whenNodePortSpecified_createServerServiceWithNodePort() {`
`442`	`442`	`}`
`443`	`443`
`444`	`444`	`private V1Service withNodePort(V1Service service, int nodePort) {`
`445`		`- service.getSpec().setType("NodePort");`
	`445`	`+ service.getSpec().type("NodePort").clusterIP(null);`
`446`	`446`	`service`
`447`	`447`	`.getSpec()`
`448`	`448`	`.getPorts()`