starlingx
/
config
Code Issues Proposed changes

allow application upload for applications with no plugins 

Starting with Kubernetes 1.20, the "kubectl cp" command will actually
error out if the item being copied doesn't exist.  Prior to this it
failed silently.

It turns out that our application upload code was relying on the silent
failure.

In order to make it work for applications without plugins we need to
make it explicit in the code that it's not a fatal error if there are
no overrides.

Change-Id: Ifb70907c84b26bf6c2e19a72a60110a20bcb399b
Closes-Bug: 1948327
Signed-off-by: Chris Friesen <chris.friesen@windriver.com>
This commit is contained in:
Chris Friesen 2021-10-21 13:16:17 -06:00
parent ba7790c7b7
commit 98e1507675
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py
View File

@ -3244,6 +3244,11 @@ class ArmadaHelper(object):
('{}/{}'.format(self.overrides_dir, app_name),
'{}:{}'.format(armada_pod, overrides_dest))]
for src_dir, dest_dir in src_dest_dirs:
# If there are no overrides it's not a fatal error.
if (src_dir.startswith(self.overrides_dir) and
not os.path.exists(src_dir)):
LOG.info("%s doesn't exist, skipping it." % src_dir)
continue
LOG.info("Copy %s to %s ." % (src_dir, dest_dir))
stdout, stderr = self.kube_cp_container(
ARMADA_NAMESPACE, src_dir, dest_dir,