Merge pull request #1453 from iocanel/svc-forward

CHANGELOG.md

@@ -12,6 +12,7 @@
   Improvements
 
     * Fix #1425: Preserve labels and fields when using CRD's withResourceVersion()
+    * Service DSL now includes methods for port forwarding
     * Introduce file and dir read / copy from pods
 
   Dependency Upgrade

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ServiceResource.java

@@ -15,6 +15,15 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-public interface ServiceResource<T, D> extends Resource<T, D> {
+import io.fabric8.kubernetes.client.LocalPortForward;
+import io.fabric8.kubernetes.client.PortForward;
+
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+
+public interface ServiceResource<T, D> extends Resource<T, D> ,
+  PortForwardable<PortForward, LocalPortForward, ReadableByteChannel, WritableByteChannel> {
+
   String getURL(String portName);
+
 }

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/ServiceOperationsImpl.java

@@ -28,9 +28,12 @@
 import io.fabric8.kubernetes.client.dsl.base.HasMetadataOperation;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 import io.fabric8.kubernetes.client.utils.URLUtils;
+import io.fabric8.kubernetes.client.utils.Utils;
 import okhttp3.OkHttpClient;
 
 
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -125,6 +128,33 @@ private String getUrlHelper(String portName) {
     return null;
   }
 
+
+  private Pod matchingPod() {
+    Service item = fromServer().get();
+    Map<String, String> labels = item.getSpec().getSelector();
+    PodList list = new PodOperationsImpl(client, config).withLabels(labels).list();
+    return list.getItems().stream().findFirst().orElseThrow(() -> new IllegalStateException("Could not find matching pod for service:" + item + "."));
+  }
+
+  @Override
+  public PortForward portForward(int port, ReadableByteChannel in, WritableByteChannel out) {
+    Pod m = matchingPod();
+    return  new PodOperationsImpl(client, config).inNamespace(m.getMetadata().getNamespace()).withName(m.getMetadata().getName()).portForward(port, in, out);
+  }
+
+
+  @Override
+  public LocalPortForward portForward(int port, int localPort) {
+    Pod m = matchingPod();
+    return  new PodOperationsImpl(client, config).inNamespace(m.getMetadata().getNamespace()).withName(m.getMetadata().getName()).portForward(port, localPort);
+  }
+
+  @Override
+  public LocalPortForward portForward(int port) {
+    Pod m = matchingPod();
+    return  new PodOperationsImpl(client, config).inNamespace(m.getMetadata().getNamespace()).withName(m.getMetadata().getName()).portForward(port);
+  }
+
   public class ServiceToUrlSortComparator implements Comparator<ServiceToURLProvider> {
     public int compare(ServiceToURLProvider first, ServiceToURLProvider second) {
       return first.getPriority() - second.getPriority();