starlingx
/
config
Code Issues Proposed changes

Merge "Notify dcmanager when k8s upgrade completes"

This commit is contained in:
Zuul 2021-05-19 23:16:21 +00:00 committed by Gerrit Code Review
parent 0d8ffe0713 32b4df542c
commit 5b3e0f244e
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sysinv/sysinv/sysinv/sysinv/api/controllers/v1/kube_upgrade.py
View File

@ -21,6 +21,7 @@ from sysinv.api.controllers.v1 import link
from sysinv.api.controllers.v1 import patch_api
from sysinv.api.controllers.v1 import types
from sysinv.common import constants
from sysinv.common import dc_api
from sysinv.common import exception
from sysinv.common import kubernetes
from sysinv.common import utils as cutils
@ -382,6 +383,12 @@ class KubeUpgradeController(rest.RestController):
LOG.info("Completed kubernetes upgrade to version: %s" %
kube_upgrade_obj.to_version)
# If applicable, notify dcmanager upgrade is complete
system = pecan.request.dbapi.isystem_get_one()
role = system.get('distributed_cloud_role')
if role == constants.DISTRIBUTED_CLOUD_ROLE_SYSTEMCONTROLLER:
dc_api.notify_dcmanager_kubernetes_upgrade_completed()
return KubeUpgrade.convert_with_links(kube_upgrade_obj)
else:

5
sysinv/sysinv/sysinv/sysinv/common/dc_api.py
View File

@ -41,3 +41,8 @@ def notify_dcmanager(events):
def notify_dcmanager_platform_upgrade_completed():
"""Send the platform-upgrade-completed event to dcmanager."""
notify_dcmanager([DC_EVENT_PLATFORM_UPGRADE_COMPLETED])
def notify_dcmanager_kubernetes_upgrade_completed():
"""Send the k8s-upgrade-completed event to dcmanager."""
notify_dcmanager([DC_EVENT_K8S_UPGRADE_COMPLETED])