kubernator 1.0.14__py3-none-any.whl → 1.0.24.dev20251109010128__py3-none-any.whl

kubernator/plugins/minikube.py

@@ -15,7 +15,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
-
+import json
 import logging
 import os
 import tempfile
@@ -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
@@ -89,7 +91,7 @@ class MinikubePlugin(KubernatorPlugin):
 
     def register(self, minikube_version=None, profile="default", k8s_version=None,
                  keep_running=False, start_fresh=False,
-                 nodes=1, driver=None, cpus="no-limit", extra_args=None):
+                 nodes=1, driver=None, cpus="no-limit", extra_args=None, extra_addons=None):
         context = self.context
 
         context.app.register_plugin("kubeconfig")
@@ -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"
@@ -156,12 +166,14 @@ class MinikubePlugin(KubernatorPlugin):
                                         minikube_file=str(minikube_file),
                                         profile=profile,
                                         k8s_version=k8s_version,
+                                        k8s_version_tuple=k8s_version_tuple,
                                         start_fresh=start_fresh,
                                         keep_running=keep_running,
                                         nodes=nodes,
                                         driver=driver,
                                         cpus=cpus,
                                         extra_args=extra_args or [],
+                                        extra_addons=extra_addons or [],
                                         kubeconfig=str(self.kubeconfig_dir / "config"),
                                         cmd=self.cmd,
                                         cmd_out=self.cmd_out
@@ -192,6 +204,16 @@ class MinikubePlugin(KubernatorPlugin):
                     "--wait", "apiserver",
                     "--nodes", str(minikube.nodes)]
 
+            addons = []
+            if minikube.k8s_version_tuple >= (1, 28):
+                addons += ["volumesnapshots", "csi-hostpath-driver"]
+
+            if minikube.extra_addons:
+                addons += minikube.extra_addons
+
+            if addons:
+                args += ["--addons", ",".join(addons)]
+
             if minikube.driver == "docker":
                 args.extend(["--cpus", str(minikube.cpus)])
 
@@ -202,11 +224,34 @@ class MinikubePlugin(KubernatorPlugin):
         logger.info("Updating minikube profile %r context", minikube.profile)
         self.cmd("update-context")
 
+        if minikube.k8s_version_tuple >= (1, 28):
+            logger.info("Disabling old storage addons")
+            self.cmd("addons", "disable", "storage-provisioner")
+            self.cmd("addons", "disable", "default-storageclass")
+
+        logger.info("Running initialization scripts for profile %r", minikube.profile)
+        self.context.app.register_plugin("kubectl", version=minikube.k8s_version)
+        if minikube.k8s_version_tuple >= (1, 28):
+            storage_class = self.context.kubectl.get("storageclass", "csi-hostpath-sc")
+            self.context.kubectl.run("delete", "storageclass", "csi-hostpath-sc")
+            storage_class["metadata"]["annotations"]["storageclass.kubernetes.io/is-default-class"] = "true"
+            storage_class["volumeBindingMode"] = "WaitForFirstConsumer"
+
+            def write_stdin():
+                return json.dumps(storage_class)
+
+            self.context.kubectl.run("create", "-f", "-", stdin=write_stdin)
+
     def minikube_stop(self):
         minikube = self.context.minikube
         if self.minikube_is_running():
             logger.info("Shutting down minikube profile %r...", minikube.profile)
-            self.cmd("stop", "-o", "json")
+            try:
+                self.cmd("stop", "-o", "json")
+            except CalledProcessError as e:
+                # Workaround for minikube 1.35.0 https://github.com/kubernetes/minikube/issues/20302
+                if e.returncode != 82:
+                    raise
 
     def minikube_delete(self):
         minikube = self.context.minikube

kubernator/plugins/template.py

@@ -20,7 +20,7 @@ import logging
 from collections.abc import Mapping
 from pathlib import Path
 
-from jsonschema import Draft7Validator, draft7_format_checker
+from jsonschema import Draft7Validator
 
 from kubernator.api import (KubernatorPlugin, Globs, scan_dir, load_file, FileType, calling_frame_source,
                             validator_with_defaults, TemplateEngine, Template)
@@ -86,7 +86,7 @@ TEMPLATE_SCHEMA = {
 
 Draft7Validator.check_schema(TEMPLATE_SCHEMA)
 TEMPLATE_VALIDATOR_CLS: type[Draft7Validator] = validator_with_defaults(Draft7Validator)
-TEMPLATE_VALIDATOR: Draft7Validator = TEMPLATE_VALIDATOR_CLS(TEMPLATE_SCHEMA, format_checker=draft7_format_checker)
+TEMPLATE_VALIDATOR: Draft7Validator = TEMPLATE_VALIDATOR_CLS(TEMPLATE_SCHEMA, format_checker=Draft7Validator.FORMAT_CHECKER)
 
 
 class TemplatePlugin(KubernatorPlugin):

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.14.dist-info → kubernator-1.0.24.dev20251109010128.dist-info}/METADATA

@@ -1,22 +1,23 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: kubernator
-Version: 1.0.14
+Version: 1.0.24.dev20251109010128
 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
@@ -31,19 +32,33 @@ 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
-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: 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.33
+Requires-Dist: jsonpath-ng~=1.7.0
+Requires-Dist: jsonschema~=4.23
+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: requests>=2.31.0
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # Kubernator
 

kubernator-1.0.24.dev20251109010128.dist-info/RECORD

@@ -0,0 +1,31 @@
+kubernator/LICENSE,sha256=wKKdOCMTCPQRV5gDkVLAsXX8qSnRJ5owk7yWPO1KZNo,11387
+kubernator/__init__.py,sha256=6ZQDZlzA65nqVQqVV-dQHp6yy2a8ZEFUX7rV2KaenYk,933
+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=LaiE8VhoqU-jHWT6G1DnBkzC9OvrkcDiLS8jiDhIGIg,31441
+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/gke.py,sha256=HZc-Bu2W8MvF50EgoAcZ8W-CAVEWJ4y8f4yG_3s8C1w,3429
+kubernator/plugins/helm.py,sha256=3y1Wr7v-Dn1twro4j2OpVFZOEXdhQmlXP9qL1l7L5kg,15156
+kubernator/plugins/istio.py,sha256=UFSBJo-I2x4F-ZO5WCSMpConOr_oYNZZb66DNOI_nME,15399
+kubernator/plugins/k8s.py,sha256=Y9QSaRzX5BDE_-nmlwjHYgVOEZK4Zs_hvnJIZ8PxZyQ,28030
+kubernator/plugins/k8s_api.py,sha256=dP4W8AFgH6mTvsbwd10EGfmG55wG3E0SZ7RGQpDgpdw,27897
+kubernator/plugins/kops.py,sha256=-yhpEjydz9E7Ep24WtEs93rLTXtw4yakdgVqXlIj1ww,9688
+kubernator/plugins/kubeconfig.py,sha256=uwtHmF2I6LiTPrC3M88G5SfYxDWtuh0MqcMfrHHoNRA,2178
+kubernator/plugins/kubectl.py,sha256=kz2BKJrg0M2yRJ4Tug9rZgjSEURbT5ybVx4fScDZt58,5102
+kubernator/plugins/minikube.py,sha256=zbboER1VsCvIsh-yUE3_XpzPNcT4c6vh1LigDonEm3U,12384
+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.24.dev20251109010128.dist-info/METADATA,sha256=zYKRkX29fX8D5DNRZg5OmWpD0wVsmV8APYHFDoioTxg,10840
+kubernator-1.0.24.dev20251109010128.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kubernator-1.0.24.dev20251109010128.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
+kubernator-1.0.24.dev20251109010128.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+kubernator-1.0.24.dev20251109010128.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
+kubernator-1.0.24.dev20251109010128.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+kubernator-1.0.24.dev20251109010128.dist-info/RECORD,,

{kubernator-1.0.14.dist-info → kubernator-1.0.24.dev20251109010128.dist-info}/WHEEL

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

kubernator-1.0.14.dist-info/RECORD

@@ -1,30 +0,0 @@
-kubernator/LICENSE,sha256=wKKdOCMTCPQRV5gDkVLAsXX8qSnRJ5owk7yWPO1KZNo,11387
-kubernator/__init__.py,sha256=dbzk7sCGIv4bkLEUq_3zNacruzzs7fFbdNAza9DnRoE,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=FQVWQydYPendvI6n5yJjacrD6DN85ex_4-d0Enb1xLg,20496
-kubernator/merge.py,sha256=eW5fajnDdI2n8aUqRfTmdG6GWDvDtcVKPKsp3fiB5Nk,5882
-kubernator/proc.py,sha256=8YlgbppyHic_51fVTPD7OP8x5yuRuL8j1kThR8MJjNI,5119
-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=3BYZBPoiMUtNgmhdcbYCVRTPtaQMYzhfnMqXWyZRJZc,10525
-kubernator/plugins/istio.py,sha256=hD-VCNVGELt7cGFbE7S7dTiqKE7rfhzE8qA9X5tsllE,10532
-kubernator/plugins/k8s.py,sha256=w_Uw8tvbeGgJ35jZs6BahWkVIlX6gxcX5-bOskudIfw,23387
-kubernator/plugins/k8s_api.py,sha256=w2aB7CU0rPqRgzhI5mLMJUUSpWlJGCsX_bHl4SjfzM8,27594
-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=kWPDIS4X1JnEoXw_rIOvgvFtjJMch39uL0mD7gQwtjE,10162
-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.14.dist-info/METADATA,sha256=Okk4ZOG_aAcheDnkoZBH5uM80bsoyUnVoq1QkO2X4UA,10496
-kubernator-1.0.14.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-kubernator-1.0.14.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
-kubernator-1.0.14.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.14.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
-kubernator-1.0.14.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.14.dist-info/RECORD,,