kubernator 1.0.21__py3-none-any.whl → 1.0.22__py3-none-any.whl

kubernator/__init__.py

@@ -16,7 +16,7 @@
 #   limitations under the License.
 #
 
-__version__ = "1.0.21"
+__version__ = "1.0.22"
 
 
 def _main():

kubernator/api.py

@@ -20,6 +20,7 @@ import fnmatch
 import json
 import logging
 import os
+import io
 import platform
 import re
 import sys
@@ -58,6 +59,53 @@ _CACHE_HEADER_TRANSLATION = {"etag": "if-none-match",
 _CACHE_HEADERS = ("etag", "last-modified")
 
 
+class TemplateEngine:
+    VARIABLE_START_STRING = "{${"
+    VARIABLE_END_STRING = "}$}"
+
+    def __init__(self, logger):
+        self.template_failures = 0
+        self.templates = {}
+
+        class CollectingUndefined(ChainableUndefined):
+            __slots__ = ()
+
+            def __str__(self):
+                self.template_failures += 1
+                return super().__str__()
+
+        logging_undefined = make_logging_undefined(
+            logger=logger,
+            base=CollectingUndefined
+        )
+
+        @pass_context
+        def variable_finalizer(ctx, value):
+            normalized_value = str(value)
+            if self.VARIABLE_START_STRING in normalized_value and self.VARIABLE_END_STRING in normalized_value:
+                value_template_content = sys.intern(normalized_value)
+                env: Environment = ctx.environment
+                value_template = self.templates.get(value_template_content)
+                if not value_template:
+                    value_template = env.from_string(value_template_content, env.globals)
+                    self.templates[value_template_content] = value_template
+                return value_template.render(ctx.parent)
+
+            return normalized_value
+
+        self.env = Environment(variable_start_string=self.VARIABLE_START_STRING,
+                               variable_end_string=self.VARIABLE_END_STRING,
+                               autoescape=False,
+                               finalize=variable_finalizer,
+                               undefined=logging_undefined)
+
+    def from_string(self, template):
+        return self.env.from_string(template)
+
+    def failures(self):
+        return self.template_failures
+
+
 def calling_frame_source(depth=2):
     f = traceback.extract_stack(limit=depth + 1)[0]
     return f"file {f.filename}, line {f.lineno} in {f.name}"
@@ -96,9 +144,15 @@ class FileType(Enum):
         self.func = func
 
 
-def _load_file(logger, path: Path, file_type: FileType, source=None) -> Iterable[dict]:
-    with open(path, "rb") as f:
+def _load_file(logger, path: Path, file_type: FileType, source=None,
+               template_engine: Optional[TemplateEngine] = None,
+               template_context: Optional[dict] = None) -> Iterable[dict]:
+    with open(path, "rb" if not template_engine else "rt") as f:
         try:
+            if template_engine:
+                raw_data = template_engine.from_string(f.read()).render(template_context)
+                f.close()
+                f = io.StringIO(raw_data)
             data = file_type.func(f)
             if isinstance(data, GeneratorType):
                 data = list(data)
@@ -191,9 +245,12 @@ def load_remote_file(logger, url, file_type: FileType, category: str = "k8s", su
     return _load_file(logger, file_name, file_type, url)
 
 
-def load_file(logger, path: Path, file_type: FileType, source=None) -> Iterable[dict]:
+def load_file(logger, path: Path, file_type: FileType, source=None,
+              template_engine: Optional[TemplateEngine] = None,
+              template_context: Optional[dict] = None) -> Iterable[dict]:
     logger.debug("Loading %s using %s", source or path, file_type.name)
-    return _load_file(logger, path, file_type)
+    return _load_file(logger, path, file_type,
+                      source, template_engine, template_context)
 
 
 def validator_with_defaults(validator_class):
@@ -513,53 +570,6 @@ class Globs(MutableSet[Union[str, re.Pattern]]):
         return f"Globs[{self._list}]"
 
 
-class TemplateEngine:
-    VARIABLE_START_STRING = "{${"
-    VARIABLE_END_STRING = "}$}"
-
-    def __init__(self, logger):
-        self.template_failures = 0
-        self.templates = {}
-
-        class CollectingUndefined(ChainableUndefined):
-            __slots__ = ()
-
-            def __str__(self):
-                self.template_failures += 1
-                return super().__str__()
-
-        logging_undefined = make_logging_undefined(
-            logger=logger,
-            base=CollectingUndefined
-        )
-
-        @pass_context
-        def variable_finalizer(ctx, value):
-            normalized_value = str(value)
-            if self.VARIABLE_START_STRING in normalized_value and self.VARIABLE_END_STRING in normalized_value:
-                value_template_content = sys.intern(normalized_value)
-                env: Environment = ctx.environment
-                value_template = self.templates.get(value_template_content)
-                if not value_template:
-                    value_template = env.from_string(value_template_content, env.globals)
-                    self.templates[value_template_content] = value_template
-                return value_template.render(ctx.parent)
-
-            return normalized_value
-
-        self.env = Environment(variable_start_string=self.VARIABLE_START_STRING,
-                               variable_end_string=self.VARIABLE_END_STRING,
-                               autoescape=False,
-                               finalize=variable_finalizer,
-                               undefined=logging_undefined)
-
-    def from_string(self, template):
-        return self.env.from_string(template)
-
-    def failures(self):
-        return self.template_failures
-
-
 class Template:
     def __init__(self, name: str, template: JinjaTemplate, defaults: dict = None, path=None, source=None):
         self.name = name

kubernator/plugins/helm.py

@@ -37,7 +37,7 @@ from kubernator.api import (KubernatorPlugin, Globs, StripNL,
                             validator_with_defaults,
                             get_golang_os,
                             get_golang_machine,
-                            prepend_os_path
+                            prepend_os_path, TemplateEngine
                             )
 from kubernator.plugins.k8s_api import K8SResource
 from kubernator.proc import DEVNULL
@@ -102,6 +102,7 @@ class HelmPlugin(KubernatorPlugin):
         self.context = None
         self.repositories = set()
         self.helm_dir = None
+        self.template_engine = TemplateEngine(logger)
 
     def set_context(self, context):
         self.context = context
@@ -180,7 +181,9 @@ class HelmPlugin(KubernatorPlugin):
             display_p = context.app.display_path(p)
             logger.debug("Adding Helm template from %s", display_p)
 
-            helm_templates = load_file(logger, p, FileType.YAML, display_p)
+            helm_templates = load_file(logger, p, FileType.YAML, display_p,
+                                       self.template_engine,
+                                       {"ktor": context})
 
             for helm_template in helm_templates:
                 self._add_helm(helm_template, display_p)
@@ -232,6 +235,17 @@ class HelmPlugin(KubernatorPlugin):
             values_file = Path(values_file)
             if not values_file.is_absolute():
                 values_file = self.context.app.cwd / values_file
+            values = list(load_file(logger, values_file, FileType.YAML,
+                                    template_engine=self.template_engine,
+                                    template_context={"ktor": self.context,
+                                                      "helm": {"chart": chart,
+                                                               "name": name,
+                                                               "namespace": namespace,
+                                                               "include_crds": include_crds,
+                                                               "repository": repository,
+                                                               "version": version,
+                                                               }}))
+            values = values[0] if values else {}
 
         version_spec = []
         if repository:
@@ -260,8 +274,7 @@ class HelmPlugin(KubernatorPlugin):
                                                         ] +
                                                        version_spec +
                                                        (["--include-crds"] if include_crds else []) +
-                                                       (["-f", values_file] if values_file else []) +
-                                                       (["-f", "-"] if values else []),
+                                                       ["-f", "-"],
                                                        stderr_logger,
                                                        stdin=stdin,
                                                        )

kubernator/plugins/istio.py

@@ -33,7 +33,7 @@ from kubernator.api import (KubernatorPlugin, scan_dir,
                             Globs,
                             get_golang_os,
                             get_golang_machine,
-                            prepend_os_path, jp)
+                            prepend_os_path, jp, load_file)
 from kubernator.plugins.k8s_api import K8SResourcePluginMixin
 
 logger = logging.getLogger("kubernator.istio")
@@ -210,10 +210,11 @@ class IstioPlugin(KubernatorPlugin, K8SResourcePluginMixin):
             display_p = context.app.display_path(p)
             logger.info("Adding Istio Operator from %s", display_p)
 
-            with open(p, "rt") as file:
-                template = self.template_engine.from_string(file.read())
+            manifests = load_file(logger, p, FileType.YAML, display_p,
+                                  self.template_engine,
+                                  {"ktor": context})
 
-            self.add_resources(template.render({"ktor": context}), display_p)
+            self.add_resources(manifests, display_p)
 
     def handle_apply(self):
         context = self.context

kubernator/plugins/k8s.py

@@ -38,7 +38,8 @@ from kubernator.api import (KubernatorPlugin,
                             FileType,
                             load_remote_file,
                             StripNL,
-                            install_python_k8s_client)
+                            install_python_k8s_client,
+                            TemplateEngine)
 from kubernator.merge import extract_merge_instructions, apply_merge_instructions
 from kubernator.plugins.k8s_api import (K8SResourcePluginMixin,
                                         K8SResource,
@@ -95,6 +96,7 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
         self._transformers = []
         self._validators = []
         self._summary = 0, 0, 0
+        self._template_engine = TemplateEngine(logger)
 
     def set_context(self, context):
         self.context = context
@@ -239,7 +241,10 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
             display_p = context.app.display_path(p)
             logger.debug("Adding Kubernetes manifest from %s", display_p)
 
-            manifests = load_file(logger, p, FileType.YAML, display_p)
+            manifests = load_file(logger, p, FileType.YAML, display_p,
+                                  self._template_engine,
+                                  {"ktor": context}
+                                  )
 
             for manifest in manifests:
                 if manifest:

kubernator/plugins/kops.py

@@ -30,7 +30,7 @@ from kubernator.api import (KubernatorPlugin, scan_dir,
                             io_StringIO,
                             TemplateEngine,
                             StripNL,
-                            Globs)
+                            Globs, load_file)
 from kubernator.plugins.k8s_api import K8SResourcePluginMixin
 from kubernator.proc import CalledProcessError
 
@@ -136,10 +136,11 @@ class KopsPlugin(KubernatorPlugin, K8SResourcePluginMixin):
             display_p = context.app.display_path(p)
             logger.debug("Adding Kops resources from %s", display_p)
 
-            with open(p, "rt") as file:
-                template = self.template_engine.from_string(file.read())
+            manifests = load_file(logger, p, FileType.YAML, display_p,
+                                  self.template_engine,
+                                  {"ktor": context})
 
-            self.add_resources(template.render({"ktor": context}), display_p)
+            self.add_resources(manifests, display_p)
 
     def update(self):
         context = self.context

{kubernator-1.0.21.dist-info → kubernator-1.0.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kubernator
-Version: 1.0.21
+Version: 1.0.22
 Summary: Kubernator is the a pluggable framework for K8S provisioning
 Home-page: https://github.com/karellen/kubernator
 Author: Express Systems USA, Inc.

{kubernator-1.0.21.dist-info → kubernator-1.0.22.dist-info}/RECORD

@@ -1,30 +1,30 @@
 kubernator/LICENSE,sha256=wKKdOCMTCPQRV5gDkVLAsXX8qSnRJ5owk7yWPO1KZNo,11387
-kubernator/__init__.py,sha256=_sCRkr5V79fanpMCglRIMGs0rrRkSIuKW8H58GnJ4NY,915
+kubernator/__init__.py,sha256=2Ip--l-XtVX9778fc9qar47xy5S1vx8WGZt0Qtar-jQ,915
 kubernator/__main__.py,sha256=f0S60wgpLu--1UlOhzfWail-xt8zyIuODodX98_yPN0,707
 kubernator/_json_path.py,sha256=pjQKXxgbpQWETYBIrIuJZHgugF92IbEAM19AC7JUmAQ,3162
 kubernator/_k8s_client_patches.py,sha256=PEeWPInnW38NDyK7G24_Dmw-x7xHpN3vJWZeckdqgK0,76892
-kubernator/api.py,sha256=R_a22G5bcrm-xl1gP4frIbhnt7i5ksqCS6xiOOA0E0s,29009
+kubernator/api.py,sha256=nLHzhgKocgduBDT22-nlAhpR2xCS6z24jb8NTic0yNc,29547
 kubernator/app.py,sha256=ETgysPcIKEDsMTbdIw00-enSLip7Z2cECJrRxjf9ciw,21214
 kubernator/merge.py,sha256=eW5fajnDdI2n8aUqRfTmdG6GWDvDtcVKPKsp3fiB5Nk,5882
 kubernator/proc.py,sha256=43jrpTe1FCdhDIK0b6hnB6XqU_m7iYu3wbzJyzO3pl0,5979
 kubernator/plugins/__init__.py,sha256=h9TLYK8UFEi53ipZSZsTBjp0ljKhisWsgPpt_PkWrO8,670
 kubernator/plugins/awscli.py,sha256=S6X7-qFiaZ7NDVDl2Jg0t-ih9KAJ45cUjjzd5Qe93ZM,4252
 kubernator/plugins/eks.py,sha256=xe7vyPHNwuP8gEYDSzPyBkm-RkAtP64wCOqs9U5I7xI,2273
-kubernator/plugins/helm.py,sha256=R5hrDDhQ8b5BYYswvxJaM9-KsHKWPBKqHVtTRa1eSuA,11122
-kubernator/plugins/istio.py,sha256=oERwbVtIk9vMJp_miBXK3-XJKF6SDbh6PPe0p3QIekY,14924
-kubernator/plugins/k8s.py,sha256=g9PwEBE3vEZ-EPi24Bz52K-ZMv0CbEmzD29Wj1WfCLs,24518
+kubernator/plugins/helm.py,sha256=2563hLr0uJucw0xo9JLfbCtpGPRZ5e5gYTnapQrqy3w,12036
+kubernator/plugins/istio.py,sha256=1dHjD9r6Kk2-tw6OFMOfBpksnqGMguTyyF1FwwWEtI8,14977
+kubernator/plugins/k8s.py,sha256=XIHqFpdbRL57dnbgOonRD3Mxs9LVSUxQT-GPnpEyZyM,24762
 kubernator/plugins/k8s_api.py,sha256=PDa7MB9q3WMm_9tr8T6LY_ojrHpyGYiNTlvBZinbgFY,27379
-kubernator/plugins/kops.py,sha256=QsrQJUF6wGJo2QRVqP92pG5vmOTYQIc25PD_DWCzrAA,9635
+kubernator/plugins/kops.py,sha256=-yhpEjydz9E7Ep24WtEs93rLTXtw4yakdgVqXlIj1ww,9688
 kubernator/plugins/kubeconfig.py,sha256=uwtHmF2I6LiTPrC3M88G5SfYxDWtuh0MqcMfrHHoNRA,2178
 kubernator/plugins/kubectl.py,sha256=IgNghW1Q6s8V2o08eNY2NWfkkdV9Z6X2A3YFQinFr4g,4028
 kubernator/plugins/minikube.py,sha256=V7nf6YRi-NRIGMTuf4JvrIUFCQXyjBs3kTBjAk5NDDw,10922
 kubernator/plugins/template.py,sha256=542nyS4ZNgdwJHEoIA5aLP1d4C312ydd7sPM9ZFbHuI,8357
 kubernator/plugins/terraform.py,sha256=a1MPl9G8Rznjd28uMRdYWrjpFDLlFAVmLFH4hFEsMsQ,5285
 kubernator/plugins/terragrunt.py,sha256=-qN8tTqPUXJ9O7CEiJVUB0GSUQU3DUTkv-aWdIIsm7Q,5051
-kubernator-1.0.21.dist-info/METADATA,sha256=Fsv2QRkXZUjlE7oqQWVf5R-Iq_OrJ2vz9xiGrqzrQpg,10822
-kubernator-1.0.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kubernator-1.0.21.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
-kubernator-1.0.21.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.21.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
-kubernator-1.0.21.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.21.dist-info/RECORD,,
+kubernator-1.0.22.dist-info/METADATA,sha256=CnePh_LaJAjBca5EBd87AUv6Tkyj7SiqTKy2US_rNrA,10822
+kubernator-1.0.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kubernator-1.0.22.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
+kubernator-1.0.22.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+kubernator-1.0.22.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
+kubernator-1.0.22.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+kubernator-1.0.22.dist-info/RECORD,,