kubernator 1.0.20.dev20250519050248__py3-none-any.whl → 1.0.21__py3-none-any.whl

kubernator/__init__.py

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

kubernator/api.py

@@ -768,7 +768,8 @@ class KubernatorPlugin:
         pass
 
 
-def install_python_k8s_client(run, package_major, logger, logger_stdout, logger_stderr, disable_patching):
+def install_python_k8s_client(run, package_major, logger, logger_stdout, logger_stderr, disable_patching,
+                              fallback=False):
     cache_dir = get_cache_dir("python")
     package_major_dir = cache_dir / str(package_major)
     package_major_dir_str = str(package_major_dir)
@@ -780,14 +781,43 @@ def install_python_k8s_client(run, package_major, logger, logger_stdout, logger_
                     str(package_major), package_major_dir)
         rmtree(package_major_dir)
 
-    if not package_major_dir.exists():
+    if not package_major_dir.exists() or not len(os.listdir(package_major_dir)):
         package_major_dir.mkdir(parents=True, exist_ok=True)
-        run([sys.executable, "-m", "pip", "install", "--no-deps", "--no-input",
-             "--root-user-action=ignore", "--break-system-packages", "--disable-pip-version-check",
-             "--target", package_major_dir_str, f"kubernetes>={package_major!s}dev0,<{int(package_major) + 1!s}"],
-            logger_stdout, logger_stderr).wait()
+        try:
+            run([sys.executable, "-m", "pip", "install", "--no-deps", "--no-input",
+                 "--root-user-action=ignore", "--break-system-packages", "--disable-pip-version-check",
+                 "--target", package_major_dir_str, f"kubernetes>={package_major!s}dev0,<{int(package_major) + 1!s}"],
+                logger_stdout, logger_stderr)
+        except CalledProcessError as e:
+            if not fallback and "No matching distribution found for" in e.stderr:
+                logger.warning("Kubernetes Client %s (%s) failed to install because the version wasn't found. "
+                               "Falling back to a client of the previous version - %s",
+                               str(package_major), package_major_dir, int(package_major) - 1)
+                return install_python_k8s_client(run,
+                                                 int(package_major) - 1,
+                                                 logger,
+                                                 logger_stdout,
+                                                 logger_stderr,
+                                                 disable_patching,
+                                                 fallback=True)
+            else:
+                raise
 
     if not patch_indicator.exists() and not disable_patching:
+        if not fallback and not len(os.listdir(package_major_dir)):
+            # Directory is empty
+            logger.warning("Kubernetes Client %s (%s) directory is empty - the client was not installed. "
+                           "Falling back to a client of the previous version - %s",
+                           str(package_major), package_major_dir, int(package_major) - 1)
+
+            return install_python_k8s_client(run,
+                                             int(package_major) - 1,
+                                             logger,
+                                             logger_stdout,
+                                             logger_stderr,
+                                             disable_patching,
+                                             fallback=True)
+
         for patch_text, target_file, skip_if_found, min_version, max_version, name in (
                 URLLIB_HEADERS_PATCH, CUSTOM_OBJECT_PATCH_23, CUSTOM_OBJECT_PATCH_25):
             patch_target = package_major_dir / target_file

kubernator/app.py

@@ -35,7 +35,7 @@ import kubernator
 from kubernator.api import (KubernatorPlugin, Globs, scan_dir, PropertyDict, config_as_dict, config_parent,
                             download_remote_file, load_remote_file, Repository, StripNL, jp, get_app_cache_dir,
                             get_cache_dir, install_python_k8s_client)
-from kubernator.proc import run, run_capturing_out
+from kubernator.proc import run, run_capturing_out, run_pass_through_capturing
 
 TRACE = 5
 
@@ -215,7 +215,7 @@ class App(KubernatorPlugin):
                 self.context = self._top_dir_context
                 context = self.context
                 self._run_handlers(KubernatorPlugin.handle_shutdown, True, context, None)
-        except: # noqa E722
+        except:  # noqa E722
             raise
         else:
             self.context = self._top_dir_context
@@ -348,6 +348,7 @@ class App(KubernatorPlugin):
                                    jp=jp,
                                    run=self._run,
                                    run_capturing_out=self._run_capturing_out,
+                                   run_passthrough_capturing=self._run_passthrough_capturing,
                                    repository=self.repository,
                                    StripNL=StripNL,
                                    default_includes=Globs(["*"], True),
@@ -465,6 +466,9 @@ class App(KubernatorPlugin):
     def _run_capturing_out(self, *args, **kwargs):
         return run_capturing_out(*args, **kwargs)
 
+    def _run_passthrough_capturing(self, *args, **kwargs):
+        return run_pass_through_capturing(*args, **kwargs)
+
     def __repr__(self):
         return "Kubernator"
 
@@ -493,7 +497,7 @@ def pre_cache_k8s_clients(*versions, disable_patching=False):
     for v in versions:
         logger.info("Caching K8S client library ~=v%s.0%s...", v,
                     " (no patches)" if disable_patching else "")
-        install_python_k8s_client(run, v, logger, stdout_logger, stderr_logger, disable_patching)
+        install_python_k8s_client(run_pass_through_capturing, v, logger, stdout_logger, stderr_logger, disable_patching)
 
 
 def main():

kubernator/plugins/k8s.py

@@ -164,7 +164,7 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
 
         logger.info("Using Kubernetes client version =~%s.0 for server version %s",
                     server_minor, ".".join(k8s.server_version))
-        pkg_dir = install_python_k8s_client(self.context.app.run, server_minor, logger,
+        pkg_dir = install_python_k8s_client(self.context.app.run_passthrough_capturing, server_minor, logger,
                                             stdout_logger, stderr_logger, k8s.disable_client_patches)
 
         modules_to_delete = []

kubernator/plugins/k8s_api.py

@@ -31,7 +31,7 @@ import yaml
 from jsonschema._format import FormatChecker
 from jsonschema._keywords import required
 from jsonschema.exceptions import ValidationError
-from jsonschema.validators import extend, Draft7Validator, RefResolver
+from jsonschema.validators import extend, Draft7Validator
 from openapi_schema_validator import OAS31Validator
 
 from kubernator.api import load_file, FileType, load_remote_file, calling_frame_source
@@ -147,10 +147,6 @@ def check_int_or_string(value):
     return check_int32(value) if is_integer(value) else is_string(value)
 
 
-# def make_api_version(group, version):
-#    return f"{group}/{version}" if group else version
-
-
 def to_group_and_version(api_version):
     group, _, version = api_version.partition("/")
     if not version:
@@ -662,10 +658,8 @@ class K8SResourcePluginMixin:
                 yield error
             else:
                 rdef = error
-                # schema = ChainMap(manifest, self.resource_definitions_schema)
                 k8s_validator = K8SValidator(rdef.schema,
-                                             format_checker=k8s_format_checker,
-                                             resolver=RefResolver.from_schema(self.resource_definitions_schema))
+                                             format_checker=k8s_format_checker)
                 yield from k8s_validator.iter_errors(manifest)
 
     def _get_manifest_rdef(self, manifest):
@@ -743,6 +737,8 @@ class K8SResourcePluginMixin:
                 rdef_paths[path] = actions
 
         for k, schema in k8s_def["definitions"].items():
+            # This short-circuits the resolution of the references to the top of the document
+            schema["definitions"] = k8s_def["definitions"]
             for key in k8s_resource_def_key(schema):
                 for rdef in K8SResourceDef.from_manifest(key, schema, self.resource_paths):
                     self.resource_definitions[key] = rdef

kubernator/plugins/minikube.py

@@ -35,6 +35,8 @@ proc_logger = logger.getChild("proc")
 stdout_logger = StripNL(proc_logger.info)
 stderr_logger = StripNL(proc_logger.warning)
 
+MINIKUBE_MAX_VERSION_LEGACY = "1.36.0"
+
 
 class MinikubePlugin(KubernatorPlugin):
     logger = logger
@@ -99,9 +101,17 @@ class MinikubePlugin(KubernatorPlugin):
             logger.critical(msg)
             raise RuntimeError(msg)
 
+        k8s_version_tuple = tuple(map(int, k8s_version.split(".")))
+
         if not minikube_version:
             minikube_version = self.get_latest_minikube_version()
             logger.info("No minikube version is specified, latest is %s", minikube_version)
+            if k8s_version_tuple < (1, 28, 0):
+                logger.info("While latest minikube version is %s, "
+                            "the requested K8S version %s requires %s or earlier - choosing %s",
+                            minikube_version, k8s_version, MINIKUBE_MAX_VERSION_LEGACY,
+                            MINIKUBE_MAX_VERSION_LEGACY)
+                minikube_version = MINIKUBE_MAX_VERSION_LEGACY
 
         minikube_dl_file, _ = context.app.download_remote_file(logger,
                                                                f"https://github.com/kubernetes/minikube/releases"

kubernator/proc.py

@@ -108,7 +108,7 @@ class ProcessRunner:
             raise RuntimeError("not available")
         return self._proc.stdin
 
-    def wait(self, fail=True, timeout=None, _out_func=None):
+    def wait(self, fail=True, timeout=None, _out_func=None, _stderr_func=None):
         with Timeout(timeout, TimeoutExpired):
             retcode = self._proc.wait()
             if self._stdin_writer:
@@ -119,9 +119,12 @@ class ProcessRunner:
                 self._stderr_reader.join()
         if fail and retcode:
             output = None
+            stderr = None
             if _out_func:
                 output = _out_func()
-            raise CalledProcessError(retcode, self._safe_args, output=output)
+            if _stderr_func:
+                stderr = _stderr_func()
+            raise CalledProcessError(retcode, self._safe_args, output=output, stderr=stderr)
         return retcode
 
     def terminate(self):
@@ -134,6 +137,25 @@ class ProcessRunner:
 run = ProcessRunner
 
 
+def run_pass_through_capturing(args, stdout_logger, stderr_logger, stdin=DEVNULL, *, safe_args=None,
+                               universal_newlines=True, **kwargs):
+    out = StringIO(trimmed=False) if universal_newlines else BytesIO()
+    err = StringIO(trimmed=False) if universal_newlines else BytesIO()
+
+    def write_out(data):
+        out.write(data)
+        stdout_logger(data)
+
+    def write_err(data):
+        err.write(data)
+        stderr_logger(data)
+
+    proc = run(args, write_out, write_err, stdin, safe_args=safe_args, universal_newlines=universal_newlines,
+               **kwargs)
+    proc.wait(_out_func=lambda: out.getvalue(), _stderr_func=lambda: err.getvalue())
+    return out.getvalue(), err.getvalue()
+
+
 def run_capturing_out(args, stderr_logger, stdin=DEVNULL, *, safe_args=None, universal_newlines=True, **kwargs):
     out = StringIO(trimmed=False) if universal_newlines else BytesIO()
     proc = run(args, out.write, stderr_logger, stdin, safe_args=safe_args, universal_newlines=universal_newlines,

{kubernator-1.0.20.dev20250519050248.dist-info → kubernator-1.0.21.dist-info}/METADATA

@@ -1,23 +1,23 @@
 Metadata-Version: 2.4
 Name: kubernator
-Version: 1.0.20.dev20250519050248
+Version: 1.0.21
 Summary: Kubernator is the a pluggable framework for K8S provisioning
 Home-page: https://github.com/karellen/kubernator
 Author: Express Systems USA, Inc.
 Author-email: 
 Maintainer: Karellen, Inc., Arcadiy Ivanov
 Maintainer-email: supervisor@karellen.co,arcadiy@karellen.co
-License: Apache License, Version 2.0
+License: Apache-2.0
 Project-URL: Bug Tracker, https://github.com/karellen/kubernator/issues
 Project-URL: Documentation, https://github.com/karellen/kubernator/
 Project-URL: Source Code, https://github.com/karellen/kubernator/
 Keywords: kubernetes k8s kube top provisioning kOps terraform tf AWS
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: POSIX :: Linux
@@ -45,8 +45,7 @@ Requires-Dist: kubernetes~=32.0
 Requires-Dist: openapi-schema-validator~=0.1
 Requires-Dist: openapi-spec-validator~=0.3
 Requires-Dist: platformdirs~=4.2
-Requires-Dist: referencing~=0.36.2
-Requires-Dist: requests<=2.31.0
+Requires-Dist: requests>=2.31.0
 Dynamic: author
 Dynamic: classifier
 Dynamic: description

{kubernator-1.0.20.dev20250519050248.dist-info → kubernator-1.0.21.dist-info}/RECORD

@@ -1,30 +1,30 @@
 kubernator/LICENSE,sha256=wKKdOCMTCPQRV5gDkVLAsXX8qSnRJ5owk7yWPO1KZNo,11387
-kubernator/__init__.py,sha256=e-LUMORChME-9EOp_4V4a5K3yCdpAbzcDwJ1A2CFwQc,933
+kubernator/__init__.py,sha256=_sCRkr5V79fanpMCglRIMGs0rrRkSIuKW8H58GnJ4NY,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=cU_dsS4PcTkRUcQqnRxsaqzeoApjhwRd2-l4CfwFZpU,27201
-kubernator/app.py,sha256=ZtQm60Cb1z2SkD338B6nue3wLOo_auRqZRW5ou_-d84,20949
+kubernator/api.py,sha256=R_a22G5bcrm-xl1gP4frIbhnt7i5ksqCS6xiOOA0E0s,29009
+kubernator/app.py,sha256=ETgysPcIKEDsMTbdIw00-enSLip7Z2cECJrRxjf9ciw,21214
 kubernator/merge.py,sha256=eW5fajnDdI2n8aUqRfTmdG6GWDvDtcVKPKsp3fiB5Nk,5882
-kubernator/proc.py,sha256=8YlgbppyHic_51fVTPD7OP8x5yuRuL8j1kThR8MJjNI,5119
+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=Zj3q_bUmbOADfjSHy2X0BhgrbXuH-fM8Vq75sYFy0nE,24496
-kubernator/plugins/k8s_api.py,sha256=dp4dFHm_ieBTQoRlnEZgiJ6sYGw0CheUt7wEmp-T060,27529
+kubernator/plugins/k8s.py,sha256=g9PwEBE3vEZ-EPi24Bz52K-ZMv0CbEmzD29Wj1WfCLs,24518
+kubernator/plugins/k8s_api.py,sha256=PDa7MB9q3WMm_9tr8T6LY_ojrHpyGYiNTlvBZinbgFY,27379
 kubernator/plugins/kops.py,sha256=QsrQJUF6wGJo2QRVqP92pG5vmOTYQIc25PD_DWCzrAA,9635
 kubernator/plugins/kubeconfig.py,sha256=uwtHmF2I6LiTPrC3M88G5SfYxDWtuh0MqcMfrHHoNRA,2178
 kubernator/plugins/kubectl.py,sha256=IgNghW1Q6s8V2o08eNY2NWfkkdV9Z6X2A3YFQinFr4g,4028
-kubernator/plugins/minikube.py,sha256=FFGW8Rkap4CPEydEgxXhIuK3A263khjli0adC5j09MA,10393
+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.20.dev20250519050248.dist-info/METADATA,sha256=b5etb-yveUpdFoyEevyUYE2w5SHYBlHPp_kQ7XvpueE,10904
-kubernator-1.0.20.dev20250519050248.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-kubernator-1.0.20.dev20250519050248.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
-kubernator-1.0.20.dev20250519050248.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.20.dev20250519050248.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
-kubernator-1.0.20.dev20250519050248.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.20.dev20250519050248.dist-info/RECORD,,
+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.20.dev20250519050248.dist-info → kubernator-1.0.21.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any