replace with latest from develop

Author: vanajamukkara

operator/src/main/java/oracle/kubernetes/operator/helpers/ServiceHelper.java

@@ -97,6 +97,9 @@ protected V1ServiceSpec createServiceSpec() {
       if (isPublishNotReadyAddressesSupported()) {
         serviceSpec.setPublishNotReadyAddresses(Boolean.TRUE);
       }
+      if (nodePort == null) {
+        serviceSpec.clusterIP("None");
+      }
       return serviceSpec;
     }
 

operator/src/test/java/oracle/kubernetes/operator/helpers/ServiceHelperTest.java

@@ -438,7 +438,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()
@@ -526,7 +526,7 @@ private ServerKubernetesObjects getServerKubernetesObjects() {
   }
 
   private V1ServiceSpec createServerServiceSpec() {
-    return createUntypedServerServiceSpec().type("ClusterIP");
+    return createUntypedServerServiceSpec().type("ClusterIP").clusterIP("None");
   }
 
   private V1ServiceSpec createUntypedServerServiceSpec() {

wercker.yml

@@ -111,7 +111,7 @@ integration-test:
       cp /etc/hosts $WERCKER_PIPELINE_DIR/hosts
       sed -i "$ a ${OCI_K8S_WORKER0_IP} ${OCI_K8S_WORKER0_HOSTNAME}" $WERCKER_PIPELINE_DIR/hosts
       cp $WERCKER_PIPELINE_DIR/hosts /etc/hosts
-      echo "DOCKER_PASSWORD $DOCKER_PASSWORD"
+
       # Update KUBECONFIG for K8S cluster
       export K8S_NODEPORT_HOST="${OCI_K8S_WORKER0_HOSTNAME}"
       sed -i -e "s,%ADDRESS%,https://$OCI_K8S_MASTER_IP:443,g" $WERCKER_SOURCE_DIR/build/kube.config
@@ -210,7 +210,7 @@ integration-test-java:
       cp /etc/hosts $WERCKER_PIPELINE_DIR/hosts
       sed -i "$ a ${OCI_K8S_WORKER0_IP} ${OCI_K8S_WORKER0_HOSTNAME}" $WERCKER_PIPELINE_DIR/hosts
       cp $WERCKER_PIPELINE_DIR/hosts /etc/hosts
-      
+
       # Update KUBECONFIG for K8S cluster
       export K8S_NODEPORT_HOST="${OCI_K8S_WORKER0_HOSTNAME}"
       sed -i -e "s,%ADDRESS%,https://$OCI_K8S_MASTER_IP:443,g" $WERCKER_SOURCE_DIR/build/kube.config
@@ -325,4 +325,4 @@ quality:
 
 dev:
   steps:
-  - internal/shell
+  - internal/shell