From db11675622e0ec26426b384a23f5b017af99a4fd Mon Sep 17 00:00:00 2001 From: itaru2622 <70509350+itaru2622@users.noreply.github.com> Date: Tue, 14 Sep 2021 01:51:43 +0900 Subject: [PATCH] fix k8s_cp uploading when target container's WORKDIR is other than '/' (#223) fix k8s_cp uploading when deployed container's WORKDIR is other than '/' SUMMARY fix #222 ISSUE TYPE Bugfix Pull Request COMPONENT NAME k8s_cp ADDITIONAL INFORMATION Reviewed-by: Mike Graves Reviewed-by: None Reviewed-by: None --- changelogs/fragments/223-k8s-cp-uploading.yaml | 2 ++ plugins/modules/k8s_cp.py | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 changelogs/fragments/223-k8s-cp-uploading.yaml diff --git a/changelogs/fragments/223-k8s-cp-uploading.yaml b/changelogs/fragments/223-k8s-cp-uploading.yaml new file mode 100644 index 00000000..03da93fb --- /dev/null +++ b/changelogs/fragments/223-k8s-cp-uploading.yaml @@ -0,0 +1,2 @@ +bugfixes: + - k8s_cp - fix k8s_cp uploading when target container's WORKDIR is not '/' (https://github.com/ansible-collections/kubernetes.core/issues/222). diff --git a/plugins/modules/k8s_cp.py b/plugins/modules/k8s_cp.py index 463757b7..b5491a9d 100644 --- a/plugins/modules/k8s_cp.py +++ b/plugins/modules/k8s_cp.py @@ -370,6 +370,9 @@ class K8SCopyToPod(K8SCopy): else: tar_command = ['tar', '-xmf', '-'] + if dest_file.startswith("/"): + tar_command.extend(['-C', '/']) + response = stream(self.api_instance.connect_get_namespaced_pod_exec, self.name, self.namespace,