fix(client): improve reliability of file upload to pod (#6212)

Fix: #6212 Signed-off-by: Florian Hussonnois <[email protected]> (cherry picked from commit f3ec2cd)
fabric8io · Aug 9, 2024 · 76596c8 · 76596c8
1 parent 01f1cfd
commit 76596c8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * Fix #6066: Added support for missing `v1.APIVersions` in KubernetesClient
 * Fix #6110: VolumeSource (and other file mode fields) in Octal are correctly interpreted
 * Fix #6215: Suppressing rejected execution exception for port forwarder
+* Fix #6212: Improved reliability of file upload to Pod
 
 ### 6.13.1 (2024-07-02)
 

diff --git a/...-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/uploadable/PodUpload.java b/...-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/uploadable/PodUpload.java
@@ -184,7 +184,7 @@ private static void addFileToTar(String fileName, File file, TarArchiveOutputStr
 
   static String createExecCommandForUpload(String file) {
     return String.format(
-        "mkdir -p %s && cat - > %s", shellQuote(getDirectoryFromFile(file)), shellQuote(file));
+        "mkdir -p %s && cat - > %s && echo $?", shellQuote(getDirectoryFromFile(file)), shellQuote(file));
   }
 
   private static String ensureEndsWithSlash(String path) {

diff --git a/...ent/src/test/java/io/fabric8/kubernetes/client/dsl/internal/uploadable/PodUploadTest.java b/...ent/src/test/java/io/fabric8/kubernetes/client/dsl/internal/uploadable/PodUploadTest.java
@@ -49,15 +49,15 @@ void withFileInRootPath_shouldCreateValidExecCommandForUpload() {
       // When
       String result = PodUpload.createExecCommandForUpload("/cp.log");
       // Then
-      assertThat(result).isEqualTo("mkdir -p '/' && cat - > '/cp.log'");
+      assertThat(result).isEqualTo("mkdir -p '/' && cat - > '/cp.log' && echo $?");
     }
 
     @Test
     void withNormalFile_shouldCreateValidExecCommandForUpload() {
       // When
       String result = PodUpload.createExecCommandForUpload("/tmp/foo/cp.log");
       // Then
-      assertThat(result).isEqualTo("mkdir -p '/tmp/foo/' && cat - > '/tmp/foo/cp.log'");
+      assertThat(result).isEqualTo("mkdir -p '/tmp/foo/' && cat - > '/tmp/foo/cp.log' && echo $?");
     }
 
     //
@@ -66,15 +66,16 @@ void withSingleQuoteInPath() {
       // When
       String result = PodUpload.createExecCommandForUpload("/tmp/fo'o/cp.log");
       // Then
-      assertThat(result).isEqualTo("mkdir -p '/tmp/fo\'\\'\'o/' && cat - > '/tmp/fo\'\\'\'o/cp.log'");
+      assertThat(result).isEqualTo("mkdir -p '/tmp/fo\'\\'\'o/' && cat - > '/tmp/fo\'\\'\'o/cp.log' && echo $?");
     }
 
     @Test
     void withMultipleSingleQuotesInPath() {
       // When
       String result = PodUpload.createExecCommandForUpload("/tmp/f'o'o/c'p.log");
       // Then
-      assertThat(result).isEqualTo("mkdir -p '/tmp/f\'\\'\'o\'\\'\'o/' && cat - > '/tmp/f\'\\'\'o\'\\'\'o/c\'\\'\'p.log'");
+      assertThat(result)
+          .isEqualTo("mkdir -p '/tmp/f\'\\'\'o\'\\'\'o/' && cat - > '/tmp/f\'\\'\'o\'\\'\'o/c\'\\'\'p.log' && echo $?");
     }
   }