starlingx/utilities
Code Issues Proposed changes

Debian: Update patched helm.py

Browse Source 
The patched helm.py file is based off some custom
modifications to helm.py.

The helm.py in sysinv changes recently, so those
changes needed to be propagated to the patched file
for debian bootstrap to succeed with recent
fluxcd changes

Task: 44830
Story: 2009138
Signed-off-by: Al Bailey <al.bailey@windriver.com>
Change-Id: I08060f66e784eea29af0c97e18bacf14adf7dcf4
This commit is contained in:
Al Bailey 2022-04-03 19:11:34 +00:00
parent 68ceaddca5
commit a45c9d1ba0
1 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/debian-integration/source-debian/helm.py.patched
View File

@ -709,7 +709,8 @@ class HelmOperator(object):
cnamespace=None, cnamespace=None,
armada_format=False, armada_format=False,
armada_chart_info=None, armada_chart_info=None,
combined=False): combined=False,
is_fluxcd_app=False):
"""Create the system overrides files for a supported application """Create the system overrides files for a supported application
This method will generate system helm chart overrides yaml files for a This method will generate system helm chart overrides yaml files for a
@ -728,10 +729,15 @@ class HelmOperator(object):
overrides overrides
:param combined: (optional) whether to apply user overrides on top of :param combined: (optional) whether to apply user overrides on top of
system overrides system overrides
:param is_fluxcd_app: whether the app is fluxcd or not
""" """
app, plugin_name = self._find_kube_app_and_app_plugin_name(app_name) app, plugin_name = self._find_kube_app_and_app_plugin_name(app_name)
if is_fluxcd_app:
armada_format = False
else:
# Get a manifest operator to provide a single point of # Get a manifest operator to provide a single point of
# manipulation for the chart, chart group and manifest schemas # manipulation for the chart, chart group and manifest schemas
manifest_op = self.get_armada_manifest_operator(app.name) manifest_op = self.get_armada_manifest_operator(app.name)
@ -741,6 +747,7 @@ class HelmOperator(object):
app.name, app.app_version, app.manifest_file) app.name, app.app_version, app.manifest_file)
manifest_op.load(armada_manifest) manifest_op.load(armada_manifest)
if plugin_name in self.helm_system_applications: if plugin_name in self.helm_system_applications:
app_overrides = self._get_helm_application_overrides(plugin_name, app_overrides = self._get_helm_application_overrides(plugin_name,
cnamespace) cnamespace)
@ -790,6 +797,7 @@ class HelmOperator(object):
overrides[key] = new_overrides overrides[key] = new_overrides
self._write_chart_overrides(path, chart_name, cnamespace, overrides) self._write_chart_overrides(path, chart_name, cnamespace, overrides)
if not is_fluxcd_app:
# Update manifest docs based on the plugin directives. If the # Update manifest docs based on the plugin directives. If the
# application does not provide a manifest operator, the # application does not provide a manifest operator, the
# GenericArmadaManifestOperator is used and chart specific # GenericArmadaManifestOperator is used and chart specific
@ -799,6 +807,7 @@ class HelmOperator(object):
self.chart_operators[chart_name].execute_manifest_updates( self.chart_operators[chart_name].execute_manifest_updates(
manifest_op) manifest_op)
if not is_fluxcd_app:
# Update the manifest based on platform conditions # Update the manifest based on platform conditions
manifest_op.platform_mode_manifest_updates(self.dbapi, mode) manifest_op.platform_mode_manifest_updates(self.dbapi, mode)
@ -842,6 +851,7 @@ class HelmOperator(object):
self._write_chart_overrides(path, chart.name, self._write_chart_overrides(path, chart.name,
cnamespace, user_overrides) cnamespace, user_overrides)
if not is_fluxcd_app:
# Write the manifest doc overrides, a summmary file for easy --value # Write the manifest doc overrides, a summmary file for easy --value
# generation on the apply, and a unified manifest for deletion. # generation on the apply, and a unified manifest for deletion.
manifest_op.save_overrides() manifest_op.save_overrides()