Kubernetes connector

client/kubernetes/src/main/java/org/jolokia/kubernetes/client/KubernetesJmxConnector.java

@@ -21,7 +21,8 @@
 public class KubernetesJmxConnector extends JolokiaJmxConnector {
 
   private static Pattern POD_PATTERN = Pattern
-      .compile("/?([^/]+)/([^/]+)/(.+)");
+      .compile(
+          "/?(?<namespace>[^/]+)/(?<protocol>https?:)?(?<podPattern>[^/^:]+)(?<port>:[^/]+)?/(?<path>.+)");
   private static KubernetesClient apiClient;
 
   public KubernetesJmxConnector(JMXServiceURL serviceURL,
@@ -71,12 +72,15 @@ protected J4pClient expandAndProbeUrl(KubernetesClient client,
       if (POD_PATTERN.matcher(proxyPath).matches()) {
         final Matcher matcher = POD_PATTERN.matcher(proxyPath);
         if (matcher.find()) {
-          String namespace = matcher.group(1);
-          String podPattern = matcher.group(2);
-          String path = matcher.group(3);
+          String namespace = matcher.group("namespace");
+          String podPattern = matcher.group("podPattern");
+          String path = matcher.group("path");
+          String protocol = matcher.group("protocol");
+          String port = matcher.group("port");
           final Pod exactPod = client.pods().inNamespace(namespace).withName(podPattern).get();
           //check if podname pans out directly
-          if (exactPod != null && (connection = probeProxyPath(env, client, exactPod, path,
+          if (exactPod != null
+              && (connection = probeProxyPath(env, client, buildProxyPath(exactPod, protocol, port, path),
               headersForProbe)) != null) {
             return connection;
           } else { //scan through pods in namespace if podname is a pattern
@@ -85,7 +89,8 @@ protected J4pClient expandAndProbeUrl(KubernetesClient client,
                 client.pods().inNamespace(namespace).list().getItems()) {
               if (pod.getMetadata()
                   .getName().matches(podPattern)) {
-                if ((connection = probeProxyPath(env, client, pod, path, headersForProbe)) != null) {
+                if ((connection = probeProxyPath(env, client, buildProxyPath(pod, protocol, port, path),
+                    headersForProbe)) != null) {
                   return connection;
                 }
               }
@@ -98,6 +103,27 @@ protected J4pClient expandAndProbeUrl(KubernetesClient client,
     throw new MalformedURLException("Unable to connect to proxypath " + proxyPath);
   }
 
+  private StringBuilder buildProxyPath(Pod pod, String protocol, String port, String path) {
+    final StringBuilder url = new StringBuilder(pod.getMetadata().getSelfLink());
+    if (protocol != null && !protocol.equals("http:")) {
+      //if we need to specify protocol, inject in url
+      final int index = url.lastIndexOf(pod.getMetadata().getName());
+      if (index > -1) {
+        url.insert(index, protocol);
+      }
+    }
+    if(port!=null){
+      url.append(port);
+    }
+    url.append("/proxy");
+
+    if(!path.startsWith("/")) {
+      url.append('/');
+    }
+    url.append(path);
+    return url;
+  }
+
   private static HashMap<String, String> createHeadersForProbe(
       Map<String, Object> env) {
     final HashMap<String, String> headers = new HashMap<String, String>();
@@ -112,10 +138,10 @@ private static HashMap<String, String> createHeadersForProbe(
    * Probe whether we find Jolokia in given namespace, pod and path
    */
   public static J4pClient probeProxyPath(Map<String, Object> env, KubernetesClient client,
-      Pod pod, String path,
+      StringBuilder url,
       HashMap<String, String> headers) {
     try {
-      final String proxyPath = pod.getMetadata().getSelfLink() + "/proxy/" + path;
+      final String proxyPath = url.toString();
       Response response = MinimalHttpClientAdapter
           .performRequest((BaseClient) client, proxyPath, "{\"type\":\"version\"}".getBytes(), null
               , headers);

client/kubernetes/src/test/java/org/jolokia/kubernetes/client/ManualTestConnection.java

@@ -13,7 +13,7 @@ public class ManualTestConnection {
   @Test(groups = "manual")
   public void testConnect() throws IOException {
     final JMXServiceURL jmxServiceURL = new JMXServiceURL(
-        "service:jmx:kubernetes:///che/petclinic-.+-.+/actuator/jolokia/"
+        "service:jmx:kubernetes:///che/petclinic-.+-.+:8778/jolokia/"
         );
     jmxServiceURL.getProtocol();