starlingx
/
config
Code Issues Proposed changes

Merge "Fixed app remove op when image download fails"

This commit is contained in:
Zuul 2022-09-16 13:12:06 +00:00 committed by Gerrit Code Review
parent 8f041315d3 b168ac9521
commit a32fccb25c
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4475,19 +4475,34 @@ class FluxCDHelper(object):
cmd = ['kubectl', '--kubeconfig', kubernetes.KUBERNETES_ADMIN_CONF,
'apply', '-k', manifest_dir]
_, stderr = cutils.trycmd(*cmd)
return True if not stderr else False
if stderr:
LOG.error("Command: %s; Error: %s" % (' '.join(cmd), stderr))
return False
return True
def _delete(self, manifest_dir):
cmd = ['kubectl', '--kubeconfig', kubernetes.KUBERNETES_ADMIN_CONF,
'delete', '-k', manifest_dir]
'delete', '-k', manifest_dir, '--ignore-not-found=true']
_, stderr = cutils.trycmd(*cmd)
return True if not stderr else False
if stderr:
LOG.error("Command: %s; Error: %s" % (' '.join(cmd), stderr))
return False
return True
def _validate(self, manifest_dir):
cmd = ['kubectl', '--kubeconfig', kubernetes.KUBERNETES_ADMIN_CONF,
'apply', '-k', manifest_dir, '--dry-run=server']
_, stderr = cutils.trycmd(*cmd)
return True if not stderr else False
if stderr:
LOG.error("Command: %s; Error: %s" % (' '.join(cmd), stderr))
return False
return True
def _rollback(self, manifest_dir):
pass