starlingx
/
config
Code Issues Proposed changes

Merge "Delete Kubernetes resources on application updates"

This commit is contained in:
Zuul 2023-11-03 15:39:36 +00:00 committed by Gerrit Code Review
parent 8c8b1e06e7 301b401c9a
commit 63ffee43a0
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1827,7 +1827,6 @@ class AppOperator(object):
self._update_app_status(new_app, constants.APP_INACTIVE_STATE)
try:
self._cleanup(new_app, app_dir=False)
self._utils._patch_report_app_dependencies(
new_app.name + '-' + new_app.version)
self._dbapi.kube_app_destroy(new_app.name,
@ -1865,6 +1864,11 @@ class AppOperator(object):
# but are not in the old application version
if (new_chart.release not in old_app_charts and
new_chart.release in deployed_releases):
# Deletes secrets that are not in the version N of the app
self._fluxcd.run_kubectl_kustomize(constants.KUBECTL_KUSTOMIZE_DELETE,
new_chart.chart_os_path)
# Send delete request in FluxCD so it doesn't
# recreate the helm release
self._kube.delete_custom_resource(
@ -1879,6 +1883,8 @@ class AppOperator(object):
else:
rc = False
self._cleanup(new_app, app_dir=False)
except exception.ApplicationApplyFailure:
rc = False
except Exception as e:
@ -2862,6 +2868,11 @@ class AppOperator(object):
# but are not in the new application version
if (from_chart.release not in to_app_charts and
from_chart.release in deployed_releases):
# Deletes secrets that are not in the n+1 app
self._fluxcd.run_kubectl_kustomize(constants.KUBECTL_KUSTOMIZE_DELETE,
from_chart.chart_os_path)
# Send delete request in FluxCD so it doesn't
# recreate the helm release
self._kube.delete_custom_resource(