starlingx
/
config
Code Issues Proposed changes

Allow versioned Armada operators to be loaded 

Enable the uploading of newer version of Armada manifest operator
for an application by checking for a suffix and overriding with the
latest numerically versioned suffix.

Change-Id: Ie1e2d9f68743236194ae184668cfbe037f6c415e
Partial-Bug: 1859882
Signed-off-by: John Kung <john.kung@windriver.com>
This commit is contained in:
John Kung 2020-01-16 15:57:47 -05:00
parent 737b98c456
commit 11929c129e
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sysinv/sysinv/sysinv/sysinv/helm/helm.py
View File

@ -32,6 +32,12 @@ LOG = logging.getLogger(__name__)
# The convention here is for the helm plugins to be named ###_PLUGINNAME.
HELM_PLUGIN_PREFIX_LENGTH = 4
# Number of optional characters appended to Armada manifest operator name,
# to allow overriding with a newer version of the Armada manifest operator.
# The convention here is for the Armada operator plugins to allow an
# optional suffix, as in PLUGINNAME_###.
ARMADA_PLUGIN_SUFFIX_LENGTH = 4
def helm_context(func):
"""Decorate to initialize the local threading context"""
@ -85,8 +91,19 @@ class HelmOperator(object):
namespace='systemconfig.armada.manifest_ops',
invoke_on_load=True, invoke_args=())
for op in armada_manifest_operators:
operators_dict[op.name] = op.obj
sorted_armada_manifest_operators = sorted(
armada_manifest_operators.extensions, key=lambda x: x.name)
for op in sorted_armada_manifest_operators:
if (op.name[-(ARMADA_PLUGIN_SUFFIX_LENGTH - 1):].isdigit() and
op.name[-ARMADA_PLUGIN_SUFFIX_LENGTH:-3] == '_'):
op_name = op.name[0:-ARMADA_PLUGIN_SUFFIX_LENGTH]
LOG.info("_load_armada_manifest_operators op.name=%s "
"adjust to op_name=%s" % (op.name, op_name))
else:
op_name = op.name
operators_dict[op_name] = op.obj
return operators_dict