Merge pull request #346 from oracle/httpclient-clusterip-fix

Support headless service in HttpClient.getServiceURL()

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/http/HttpClient.java

@@ -279,7 +279,13 @@ public static String getServiceURL(V1Service service) {
     if (service != null) {
       V1ServiceSpec spec = service.getSpec();
       if (spec != null) {
-        String portalIP = spec.getClusterIP();
+        String portalIP =
+            "None".equalsIgnoreCase(spec.getClusterIP())
+                ? service.getMetadata().getName()
+                    + "."
+                    + service.getMetadata().getNamespace()
+                    + ".svc.cluster.local"
+                : spec.getClusterIP();
         int port = spec.getPorts().iterator().next().getPort();
         portalIP += ":" + port;
         String serviceURL = HTTP_PROTOCOL + portalIP;

operator/src/test/java/oracle/kubernetes/operator/http/HttpClientTest.java

@@ -6,8 +6,13 @@
 import static oracle.kubernetes.LogMatcher.containsFine;
 import static oracle.kubernetes.operator.logging.MessageKeys.HTTP_METHOD_FAILED;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 import com.meterware.simplestub.Stub;
+import io.kubernetes.client.models.V1ObjectMeta;
+import io.kubernetes.client.models.V1Service;
+import io.kubernetes.client.models.V1ServicePort;
+import io.kubernetes.client.models.V1ServiceSpec;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
@@ -71,6 +76,38 @@ private void ignoreMessage(String message) {
     consoleControl.ignoreMessage(message);
   }
 
+  @Test
+  public void getServiceURL_returnsUrlUsingClusterIP() {
+    final String CLUSTER_IP = "123.123.123.133";
+    final int PORT = 7101;
+
+    List<V1ServicePort> ports = new ArrayList<>();
+    ports.add(new V1ServicePort().port(PORT));
+    V1Service service =
+        new V1Service().spec(new V1ServiceSpec().clusterIP(CLUSTER_IP).ports(ports));
+    String url = HttpClient.getServiceURL(service);
+    assertEquals("http://" + CLUSTER_IP + ":" + PORT, url);
+  }
+
+  @Test
+  public void getServiceURL_returnsUrlUsingDNS_ifNoneClusterIP() {
+    final String CLUSTER_IP = "None";
+    final int PORT = 7101;
+    final String NAMESPACE = "domain1";
+    final String SERVICE_NAME = "admin-server";
+
+    List<V1ServicePort> ports = new ArrayList<>();
+    ports.add(new V1ServicePort().port(PORT));
+
+    V1Service service =
+        new V1Service()
+            .spec(new V1ServiceSpec().clusterIP(CLUSTER_IP).ports(ports))
+            .metadata(new V1ObjectMeta().namespace(NAMESPACE).name(SERVICE_NAME));
+
+    String url = HttpClient.getServiceURL(service);
+    assertEquals("http://" + SERVICE_NAME + "." + NAMESPACE + ".svc.cluster.local:" + PORT, url);
+  }
+
   abstract static class ClientStub implements Client {
 
     private static Response mockResponse;