diff --git a/olm/render.py b/olm/render.py index f243951ba3..a2f1c9850f 100755 --- a/olm/render.py +++ b/olm/render.py @@ -27,14 +27,14 @@ START_BLOCK = """ #!jinja | metalk8s_kubernetes -{{%- from "metalk8s/map.jinja" import repo with context %}} -{{%- from "metalk8s/repo/macro.sls" import build_image_name with context %}} +{%- from "metalk8s/map.jinja" import repo with context %} +{%- from "metalk8s/repo/macro.sls" import build_image_name with context %} -{{% raw %}} +{% raw %} """ END_BLOCK = """ -{{% endraw %}} +{% endraw %} """ class DownloadError(Exception): @@ -121,7 +121,7 @@ def _fix_strings(obj): else: return obj manifest = _fix_strings(manifest) - out = START_BLOCK + out = START_BLOCK.lstrip() stream = io.StringIO() yaml.safe_dump_all( manifest, diff --git a/salt/metalk8s/addons/olm/deployed/chart.sls b/salt/metalk8s/addons/olm/deployed/chart.sls index dc17850e8b..3b8a22c0c2 100644 --- a/salt/metalk8s/addons/olm/deployed/chart.sls +++ b/salt/metalk8s/addons/olm/deployed/chart.sls @@ -1,10 +1,9 @@ - #!jinja | metalk8s_kubernetes -{{%- from "metalk8s/map.jinja" import repo with context %}} -{{%- from "metalk8s/repo/macro.sls" import build_image_name with context %}} +{%- from "metalk8s/map.jinja" import repo with context %} +{%- from "metalk8s/repo/macro.sls" import build_image_name with context %} -{{% raw %}} +{% raw %} apiVersion: v1 kind: Namespace metadata: @@ -1704,4 +1703,4 @@ webhooks: sideEffects: None timeoutSeconds: 10 -{{% endraw %}} +{% endraw %}