starlingx
/
config
Code Issues Proposed changes

Merge "Allow k8s application audit when k8s upgrade is completed"

This commit is contained in:
Zuul 2021-07-21 20:31:44 +00:00 committed by Gerrit Code Review
parent d4abe7c5c5 f23a05614a
commit 1b170aa0eb
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sysinv/sysinv/sysinv/sysinv/conductor/manager.py
View File

@ -7732,11 +7732,14 @@ class ConductorManager(service.PeriodicService):
raise exception.SysinvException(_("Platform upgrade in progress."))
try:
self.dbapi.kube_upgrade_get_one()
kube_upgrade = self.dbapi.kube_upgrade_get_one()
if kube_upgrade.state == kubernetes.KUBE_UPGRADE_COMPLETE:
return
except exception.NotFound:
pass
else:
raise exception.SysinvException(_("Kubernetes upgrade in progress."))
raise exception.SysinvException(_(
"Kubernetes upgrade is in progress and not completed."))
def report_partition_mgmt_success(self, host_uuid, idisk_uuid,
partition_uuid):