kubernator 1.0.16.dev20240514041500__py3-none-any.whl → 1.0.17__py3-none-any.whl

kubernator/__init__.py

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

kubernator/api.py

@@ -38,7 +38,6 @@ from typing import Optional, Union, MutableSequence
 
 import requests
 import yaml
-from platformdirs import user_cache_dir
 from diff_match_patch import diff_match_patch
 from jinja2 import (Environment,
                     ChainableUndefined,
@@ -46,6 +45,7 @@ from jinja2 import (Environment,
                     Template as JinjaTemplate,
                     pass_context)
 from jsonschema import validators
+from platformdirs import user_cache_dir
 
 from kubernator._json_path import jp  # noqa: F401
 from kubernator._k8s_client_patches import (URLLIB_HEADERS_PATCH,
@@ -765,9 +765,10 @@ def install_python_k8s_client(run, package_major, logger, logger_stdout, logger_
 
     if not package_major_dir.exists():
         package_major_dir.mkdir(parents=True, exist_ok=True)
-        run([sys.executable, "-m", "pip", "install", "--no-deps", "--no-input", "--pre",
+        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}.0"], logger_stdout, logger_stderr).wait()
+             "--target", package_major_dir_str, f"kubernetes>={package_major!s}dev0,<{int(package_major) + 1!s}"],
+            logger_stdout, logger_stderr).wait()
 
     if not patch_indicator.exists() and not disable_patching:
         for patch_text, target_file, skip_if_found, min_version, max_version, name in (

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
 
@@ -193,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

{kubernator-1.0.16.dev20240514041500.dist-info → kubernator-1.0.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kubernator
-Version: 1.0.16.dev20240514041500
+Version: 1.0.17
 Summary: Kubernator is the a pluggable framework for K8S provisioning
 Home-page: https://github.com/karellen/kubernator
 Author: Express Systems USA, Inc.
@@ -31,19 +31,20 @@ Classifier: Intended Audience :: Developers
 Classifier: Development Status :: 4 - Beta
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: coloredlogs ~=15.0
-Requires-Dist: diff-match-patch >2023.0
-Requires-Dist: gevent >=21.1.2
-Requires-Dist: jinja2 ~=3.1
-Requires-Dist: json-log-formatter ~=0.3
-Requires-Dist: jsonpatch ~=1.32
-Requires-Dist: jsonpath-ng ~=1.6.1
-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: platformdirs ~=4.2
-Requires-Dist: requests ~=2.25
+Requires-Dist: coloredlogs~=15.0
+Requires-Dist: diff-match-patch>2023.0
+Requires-Dist: durationpy>=0.7
+Requires-Dist: gevent>=21.1.2
+Requires-Dist: jinja2~=3.1
+Requires-Dist: json-log-formatter~=0.3
+Requires-Dist: jsonpatch~=1.32
+Requires-Dist: jsonpath-ng~=1.6.1
+Requires-Dist: jsonschema<4.0
+Requires-Dist: kubernetes~=30.0
+Requires-Dist: openapi-schema-validator~=0.1
+Requires-Dist: openapi-spec-validator~=0.3
+Requires-Dist: platformdirs~=4.2
+Requires-Dist: requests<=2.31.0
 
 # Kubernator
 

{kubernator-1.0.16.dev20240514041500.dist-info → kubernator-1.0.17.dist-info}/RECORD

@@ -1,9 +1,9 @@
 kubernator/LICENSE,sha256=wKKdOCMTCPQRV5gDkVLAsXX8qSnRJ5owk7yWPO1KZNo,11387
-kubernator/__init__.py,sha256=aqeBXLbCmdMcUrhUStjIfCoLAM5qC7yn9conp2FcC58,933
+kubernator/__init__.py,sha256=gAjhdip8fRJb9Pn3h8PXD--afamYsaBOkCNxZTJKDXA,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=sW_ou7CCsi2buLBdQI0x8xYfLq2LVz-2lnAB9sELumA,26701
+kubernator/api.py,sha256=kEmfsSbiNxogn-ZG2n7_m93yF-Wg9379sMUySnNGaSY,26736
 kubernator/app.py,sha256=ZtQm60Cb1z2SkD338B6nue3wLOo_auRqZRW5ou_-d84,20949
 kubernator/merge.py,sha256=eW5fajnDdI2n8aUqRfTmdG6GWDvDtcVKPKsp3fiB5Nk,5882
 kubernator/proc.py,sha256=8YlgbppyHic_51fVTPD7OP8x5yuRuL8j1kThR8MJjNI,5119
@@ -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=D9BVseCuhMfiveY4NBoG4ZBWFisE9aWWlnbB7tRO0hk,24200
+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.16.dev20240514041500.dist-info/METADATA,sha256=kSnOkWn46LQIGaRRLZuF3x1n7Ckc7t3wVAkMP9sT_Dg,10519
-kubernator-1.0.16.dev20240514041500.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-kubernator-1.0.16.dev20240514041500.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
-kubernator-1.0.16.dev20240514041500.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.16.dev20240514041500.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
-kubernator-1.0.16.dev20240514041500.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.16.dev20240514041500.dist-info/RECORD,,
+kubernator-1.0.17.dist-info/METADATA,sha256=mnATlQPIcepM7Xnt81EwQVC10W02martshWA5wxSx20,10521
+kubernator-1.0.17.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+kubernator-1.0.17.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
+kubernator-1.0.17.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+kubernator-1.0.17.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
+kubernator-1.0.17.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+kubernator-1.0.17.dist-info/RECORD,,

{kubernator-1.0.16.dev20240514041500.dist-info → kubernator-1.0.17.dist-info}/WHEEL

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