Leave clusterIP blank for NodePort

Author: rjeberhard

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;
     }
 

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()