kubernator 1.0.15__py3-none-any.whl → 1.0.16__py3-none-any.whl

kubernator/__init__.py

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

kubernator/api.py

@@ -38,7 +38,7 @@ from typing import Optional, Union, MutableSequence
 
 import requests
 import yaml
-from appdirs import user_config_dir
+from platformdirs import user_cache_dir
 from diff_match_patch import diff_match_patch
 from jinja2 import (Environment,
                     ChainableUndefined,
@@ -118,17 +118,17 @@ def _download_remote_file(url, file_name, cache: dict):
 
 
 def get_app_cache_dir():
-    return Path(user_config_dir("kubernator"))
+    return Path(user_cache_dir("kubernator", "karellen"))
 
 
 def get_cache_dir(category: str, sub_category: str = None):
-    config_dir = get_app_cache_dir() / category
+    cache_dir = get_app_cache_dir() / category
     if sub_category:
-        config_dir = config_dir / sub_category
-    if not config_dir.exists():
-        config_dir.mkdir(parents=True)
+        cache_dir = cache_dir / sub_category
+    if not cache_dir.exists():
+        cache_dir.mkdir(parents=True)
 
-    return config_dir
+    return cache_dir
 
 
 def download_remote_file(logger, url: str, category: str = "k8s", sub_category: str = None,
@@ -747,6 +747,9 @@ class KubernatorPlugin:
     def handle_shutdown(self):
         pass
 
+    def handle_summary(self):
+        pass
+
 
 def install_python_k8s_client(run, package_major, logger, logger_stdout, logger_stderr, disable_patching):
     cache_dir = get_cache_dir("python")

kubernator/app.py

@@ -178,42 +178,49 @@ class App(KubernatorPlugin):
         self.register_plugin(self)
 
         try:
-            while True:
-                cwd = self.next()
-                if not cwd:
-                    logger.debug("No paths left to traverse")
-                    break
+            try:
+                while True:
+                    cwd = self.next()
+                    if not cwd:
+                        logger.debug("No paths left to traverse")
+                        break
 
-                context = self.context
+                    context = self.context
 
-                logger.debug("Inspecting directory %s", self._display_path(cwd))
-                self._run_handlers(KubernatorPlugin.handle_before_dir, False, context, None, cwd)
+                    logger.debug("Inspecting directory %s", self._display_path(cwd))
+                    self._run_handlers(KubernatorPlugin.handle_before_dir, False, context, None, cwd)
 
-                if (ktor_py := (cwd / ".kubernator.py")).exists():
-                    self._run_handlers(KubernatorPlugin.handle_before_script, False, context, None, cwd)
+                    if (ktor_py := (cwd / ".kubernator.py")).exists():
+                        self._run_handlers(KubernatorPlugin.handle_before_script, False, context, None, cwd)
 
-                    for h in self.context._plugins:
-                        h.set_context(context)
+                        for h in self.context._plugins:
+                            h.set_context(context)
 
-                    self._exec_ktor(ktor_py)
+                        self._exec_ktor(ktor_py)
 
-                    for h in self.context._plugins:
-                        h.set_context(None)
+                        for h in self.context._plugins:
+                            h.set_context(None)
 
-                    self._run_handlers(KubernatorPlugin.handle_after_script, True, context, None, cwd)
+                        self._run_handlers(KubernatorPlugin.handle_after_script, True, context, None, cwd)
 
-                self._run_handlers(KubernatorPlugin.handle_after_dir, True, context, None, cwd)
+                    self._run_handlers(KubernatorPlugin.handle_after_dir, True, context, None, cwd)
 
-            self.context = self._top_dir_context
-            context = self.context
+                self.context = self._top_dir_context
+                context = self.context
 
-            self._run_handlers(KubernatorPlugin.handle_apply, True, context, None)
+                self._run_handlers(KubernatorPlugin.handle_apply, True, context, None)
 
-            self._run_handlers(KubernatorPlugin.handle_verify, True, context, None)
-        finally:
+                self._run_handlers(KubernatorPlugin.handle_verify, True, context, None)
+            finally:
+                self.context = self._top_dir_context
+                context = self.context
+                self._run_handlers(KubernatorPlugin.handle_shutdown, True, context, None)
+        except: # noqa E722
+            raise
+        else:
             self.context = self._top_dir_context
             context = self.context
-            self._run_handlers(KubernatorPlugin.handle_shutdown, True, context, None)
+            self._run_handlers(KubernatorPlugin.handle_summary, True, context, None)
 
     def discover_plugins(self):
         importlib.invalidate_caches()

kubernator/plugins/k8s.py

@@ -68,6 +68,19 @@ def final_resource_validator(resources: Sequence[K8SResource],
                     resource, resource.source)
 
 
+def normalize_pkg_version(v: str):
+    v_split = v.split(".")
+    rev = v_split[-1]
+    if not rev.isdigit():
+        new_rev = ""
+        for c in rev:
+            if not c.isdigit():
+                break
+            new_rev += c
+        v_split[-1] = new_rev
+    return tuple(map(int, v_split))
+
+
 class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
     logger = logger
 
@@ -81,6 +94,7 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
 
         self._transformers = []
         self._validators = []
+        self._summary = 0, 0, 0
 
     def set_context(self, context):
         self.context = context
@@ -192,7 +206,8 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
         k8s.server_git_version = git_version
 
         logger.info("Found Kubernetes %s on %s", k8s.server_git_version, k8s.client.configuration.host)
-        K8SResource._k8s_client_version = tuple(map(int, pkg_version("kubernetes").split(".")))
+
+        K8SResource._k8s_client_version = normalize_pkg_version(pkg_version("kubernetes"))
         K8SResource._k8s_field_validation = k8s.field_validation
         K8SResource._k8s_field_validation_patched = not k8s.disable_client_patches
         K8SResource._logger = self.logger
@@ -248,6 +263,7 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
 
         patch_field_excludes = [re.compile(e) for e in context.globals.k8s.patch_field_excludes]
         dump_results = []
+        total_created, total_patched, total_deleted = 0, 0, 0
         for resource in self.resources.values():
             if dump:
                 resource_id = {"apiVersion": resource.api_version,
@@ -280,13 +296,17 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
                 create_func = partial(resource.create, dry_run=dry_run)
                 delete_func = partial(resource.delete, dry_run=dry_run)
 
-            self._apply_resource(dry_run,
-                                 patch_field_excludes,
-                                 resource,
-                                 patch_func,
-                                 create_func,
-                                 delete_func,
-                                 status_msg)
+            created, patched, deleted = self._apply_resource(dry_run,
+                                                             patch_field_excludes,
+                                                             resource,
+                                                             patch_func,
+                                                             create_func,
+                                                             delete_func,
+                                                             status_msg)
+
+            total_created += created
+            total_patched += patched
+            total_deleted += deleted
 
         if ((dump or dry_run) and
                 k8s.field_validation_warn_fatal and self.context.globals.k8s.field_validation_warnings):
@@ -301,6 +321,12 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
                           indent=4 if file_format == "json-pretty" else None)
             else:
                 yaml.safe_dump(dump_results, file)
+        else:
+            self._summary = total_created, total_patched, total_deleted
+
+    def handle_summary(self):
+        total_created, total_patched, total_deleted = self._summary
+        logger.info("Created %d, patched %d, deleted %d resources", total_created, total_patched, total_deleted)
 
     def api_load_resources(self, path: Path, file_type: str):
         return self.add_local_resources(path, FileType[file_type.upper()])
@@ -422,6 +448,7 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
             if e.status == 404:
                 try:
                     create()
+                    return 1, 0, 0
                 except ApiException as e:
                     if not handle_400_strict_validation_error(e):
                         raise
@@ -459,7 +486,7 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
                                             status_msg)
                                 delete_func(propagation_policy=propagation_policy)
                                 create(exists_ok=dry_run)
-                                return
+                                return 1, 0, 1
                         raise
                 else:
                     if not handle_400_strict_validation_error(e):
@@ -476,8 +503,10 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
                 if patch:
                     logger.info("Patching resource %s%s", resource, status_msg)
                     patch_func(patch)
+                    return 0, 1, 0
                 else:
                     logger.info("Nothing to patch for resource %s", resource)
+                    return 0, 0, 0
 
     def _filter_resource_patch(self, patch: Iterable[Mapping], excludes: Iterable[re.compile]):
         result = []

{kubernator-1.0.15.dist-info → kubernator-1.0.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kubernator
-Version: 1.0.15
+Version: 1.0.16
 Summary: Kubernator is the a pluggable framework for K8S provisioning
 Home-page: https://github.com/karellen/kubernator
 Author: Express Systems USA, Inc.
@@ -31,7 +31,6 @@ Classifier: Intended Audience :: Developers
 Classifier: Development Status :: 4 - Beta
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: appdirs ~=1.4
 Requires-Dist: coloredlogs ~=15.0
 Requires-Dist: diff-match-patch >2023.0
 Requires-Dist: gevent >=21.1.2
@@ -43,7 +42,8 @@ Requires-Dist: jsonschema <4.0
 Requires-Dist: kubernetes ~=29.0
 Requires-Dist: openapi-schema-validator ~=0.1
 Requires-Dist: openapi-spec-validator ~=0.3
-Requires-Dist: requests ~=2.25
+Requires-Dist: platformdirs ~=4.2
+Requires-Dist: requests <=2.31.0
 
 # Kubernator
 

{kubernator-1.0.15.dist-info → kubernator-1.0.16.dist-info}/RECORD

@@ -1,10 +1,10 @@
 kubernator/LICENSE,sha256=wKKdOCMTCPQRV5gDkVLAsXX8qSnRJ5owk7yWPO1KZNo,11387
-kubernator/__init__.py,sha256=4O0v8eOlw-yy8RhmTF4gZN-X6QzRItdYc7qeW_2dOms,915
+kubernator/__init__.py,sha256=kM163cxCijR8n3EdwY1rtDuVdXDxAw5Wl7TnvirO8cY,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=O1wJ2K_u8CoFDMzSood5_VkP4L1Hmo4VWQQxn9D1T4A,26648
-kubernator/app.py,sha256=xY1zH3sGpEY0p542S7NZM4TszM5Oac658zZAJhCj8B8,20603
+kubernator/api.py,sha256=sW_ou7CCsi2buLBdQI0x8xYfLq2LVz-2lnAB9sELumA,26701
+kubernator/app.py,sha256=ZtQm60Cb1z2SkD338B6nue3wLOo_auRqZRW5ou_-d84,20949
 kubernator/merge.py,sha256=eW5fajnDdI2n8aUqRfTmdG6GWDvDtcVKPKsp3fiB5Nk,5882
 kubernator/proc.py,sha256=8YlgbppyHic_51fVTPD7OP8x5yuRuL8j1kThR8MJjNI,5119
 kubernator/plugins/__init__.py,sha256=h9TLYK8UFEi53ipZSZsTBjp0ljKhisWsgPpt_PkWrO8,670
@@ -12,7 +12,7 @@ kubernator/plugins/awscli.py,sha256=S6X7-qFiaZ7NDVDl2Jg0t-ih9KAJ45cUjjzd5Qe93ZM,
 kubernator/plugins/eks.py,sha256=xe7vyPHNwuP8gEYDSzPyBkm-RkAtP64wCOqs9U5I7xI,2273
 kubernator/plugins/helm.py,sha256=3BYZBPoiMUtNgmhdcbYCVRTPtaQMYzhfnMqXWyZRJZc,10525
 kubernator/plugins/istio.py,sha256=hD-VCNVGELt7cGFbE7S7dTiqKE7rfhzE8qA9X5tsllE,10532
-kubernator/plugins/k8s.py,sha256=w_Uw8tvbeGgJ35jZs6BahWkVIlX6gxcX5-bOskudIfw,23387
+kubernator/plugins/k8s.py,sha256=Zj3q_bUmbOADfjSHy2X0BhgrbXuH-fM8Vq75sYFy0nE,24496
 kubernator/plugins/k8s_api.py,sha256=w2aB7CU0rPqRgzhI5mLMJUUSpWlJGCsX_bHl4SjfzM8,27594
 kubernator/plugins/kops.py,sha256=QsrQJUF6wGJo2QRVqP92pG5vmOTYQIc25PD_DWCzrAA,9635
 kubernator/plugins/kubeconfig.py,sha256=uwtHmF2I6LiTPrC3M88G5SfYxDWtuh0MqcMfrHHoNRA,2178
@@ -21,10 +21,10 @@ kubernator/plugins/minikube.py,sha256=kWPDIS4X1JnEoXw_rIOvgvFtjJMch39uL0mD7gQwtj
 kubernator/plugins/template.py,sha256=KEiPfI7TbYXmF4a8ATWuFhxxWbcASHttFM_ekYEZ8Ps,8371
 kubernator/plugins/terraform.py,sha256=a1MPl9G8Rznjd28uMRdYWrjpFDLlFAVmLFH4hFEsMsQ,5285
 kubernator/plugins/terragrunt.py,sha256=-qN8tTqPUXJ9O7CEiJVUB0GSUQU3DUTkv-aWdIIsm7Q,5051
-kubernator-1.0.15.dist-info/METADATA,sha256=soZKwIiDi46ShjpnJSH_9_Anu9hvbZUeUIDsIIMqOa8,10496
-kubernator-1.0.15.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-kubernator-1.0.15.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
-kubernator-1.0.15.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.15.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
-kubernator-1.0.15.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.15.dist-info/RECORD,,
+kubernator-1.0.16.dist-info/METADATA,sha256=LlHz8k2lx4hnHKVULshjY7ZM--WxvecEkik7FNq5Pew,10503
+kubernator-1.0.16.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+kubernator-1.0.16.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
+kubernator-1.0.16.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+kubernator-1.0.16.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
+kubernator-1.0.16.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+kubernator-1.0.16.dist-info/RECORD,,