Merge pull request #1444 from iocanel/copy

CHANGELOG.md

@@ -12,6 +12,7 @@
   Improvements
 
     * Fix #1425: Preserve labels and fields when using CRD's withResourceVersion()
+    * Introduce file and dir read / copy from pods
 
   Dependency Upgrade
     * Upgrade Sundrio to 0.16.5

kubernetes-client/pom.xml

@@ -213,7 +213,18 @@
       <artifactId>bcpkix-jdk15on</artifactId>
       <version>${bouncycastle.version}</version>
     </dependency>
-
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>${commons-codec.version}</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
+      <version>${commons-compress.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>com.github.mifmif</groupId>
       <artifactId>generex</artifactId>

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

@@ -15,7 +15,9 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-public interface ContainerResource<S,W, I, PI, O, PO, X, T>
+
+public interface ContainerResource<S,W, I, PI, O, PO, X, T, B, IS>
         extends TtyExecInputOutputErrorable<X, O, PO, I, PI, T>,
+                FileSelector<CopyOrReadable<B, IS>>,
   TimestampBytesLimitTerminateTimeTailPrettyLoggable<S, W> {
 }

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

@@ -0,0 +1,23 @@
+/**
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.fabric8.kubernetes.client.dsl;
+
+import java.nio.file.Path;
+
+public interface Copiable<T> {
+
+  T copy(Path destination);
+}

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

@@ -0,0 +1,20 @@
+/**
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.fabric8.kubernetes.client.dsl;
+
+public interface CopyOrReadable<B, I> extends Copiable<B>, Readable<I> {
+
+}

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

@@ -0,0 +1,23 @@
+/**
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.fabric8.kubernetes.client.dsl;
+
+public interface FileSelector<T> {
+
+  T file(String path);
+
+  T dir(String path);
+}

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

@@ -27,7 +27,7 @@
 
 public interface PodResource<T, D> extends Resource<T, D>,
         Loggable<String, LogWatch>,
-        Containerable<String, ContainerResource<String, LogWatch, InputStream, PipedOutputStream, OutputStream, PipedInputStream, String, ExecWatch>>,
-        ContainerResource<String, LogWatch, InputStream, PipedOutputStream, OutputStream, PipedInputStream, String, ExecWatch>,
+        Containerable<String, ContainerResource<String, LogWatch, InputStream, PipedOutputStream, OutputStream, PipedInputStream, String, ExecWatch, Boolean, InputStream>>,
+        ContainerResource<String, LogWatch, InputStream, PipedOutputStream, OutputStream, PipedInputStream, String, ExecWatch, Boolean, InputStream>,
         PortForwardable<PortForward, LocalPortForward, ReadableByteChannel, WritableByteChannel> {
 }

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

@@ -0,0 +1,23 @@
+/**
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.fabric8.kubernetes.client.dsl;
+
+
+public interface Readable<T> {
+
+  T read();
+
+}