kubernator 1.0.19__py3-none-any.whl → 1.0.20.dev20250518194115__py3-none-any.whl

kubernator/__init__.py

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

kubernator/api.py

@@ -39,6 +39,7 @@ from typing import Optional, Union, MutableSequence
 import requests
 import yaml
 from diff_match_patch import diff_match_patch
+from gevent import sleep
 from jinja2 import (Environment,
                     ChainableUndefined,
                     make_logging_undefined,
@@ -108,13 +109,29 @@ def _load_file(logger, path: Path, file_type: FileType, source=None) -> Iterable
 
 
 def _download_remote_file(url, file_name, cache: dict):
-    with requests.get(url, headers=cache, stream=True) as r:
-        r.raise_for_status()
-        if r.status_code != 304:
-            with open(file_name, "wb") as out:
-                for chunk in r.iter_content(chunk_size=65535):
-                    out.write(chunk)
-            return dict(r.headers)
+    retry_delay = 0
+    while True:
+        if retry_delay:
+            sleep(retry_delay)
+
+        with requests.get(url, headers=cache, stream=True) as r:
+            if r.status_code == 429:
+                if not retry_delay:
+                    retry_delay = 0.2
+                else:
+                    retry_delay *= 2.0
+                if retry_delay > 2.5:
+                    retry_delay = 2.5
+                continue
+
+            r.raise_for_status()
+            if r.status_code != 304:
+                with open(file_name, "wb") as out:
+                    for chunk in r.iter_content(chunk_size=65535):
+                        out.write(chunk)
+                return dict(r.headers)
+            else:
+                return None
 
 
 def get_app_cache_dir():

kubernator/plugins/helm.py

@@ -85,7 +85,7 @@ HELM_SCHEMA = {
         }
     },
     "type": "object",
-    "required": ["repository", "chart", "version", "name", "namespace"]
+    "required": ["chart", "name", "namespace"]
 }
 
 Draft7Validator.check_schema(HELM_SCHEMA)
@@ -130,7 +130,7 @@ class HelmPlugin(KubernatorPlugin):
             helm_tar = tarfile.open(helm_file_dl)
             helm_tar.extractall(self.helm_dir.name)
 
-            copy(Path(self.helm_dir.name)/f"{get_golang_os()}-{get_golang_machine()}"/"helm", helm_file)
+            copy(Path(self.helm_dir.name) / f"{get_golang_os()}-{get_golang_machine()}" / "helm", helm_file)
 
             os.chmod(helm_file, 0o500)
             prepend_os_path(self.helm_dir.name)
@@ -215,17 +215,34 @@ class HelmPlugin(KubernatorPlugin):
 
         return repository_hash
 
-    def _internal_add_helm(self, source, *, repository, chart, version, name, namespace, include_crds,
-                           values=None, values_file=None):
+    def _internal_add_helm(self, source, *, chart, name, namespace, include_crds,
+                           values=None, values_file=None, repository=None, version=None):
         if values and values_file:
             raise RuntimeError(f"In {source} either values or values file may be specified, but not both")
 
+        if (repository and chart and chart.startswith("oci://") or
+                not repository and chart and not chart.startswith("oci://")):
+            raise RuntimeError(
+                f"In {source} either repository must be specified or OCI-chart must be used, but not both")
+
+        if not version and repository:
+            raise RuntimeError(f"In {source} version must be specified unless OCI-chart is used")
+
         if values_file:
             values_file = Path(values_file)
             if not values_file.is_absolute():
                 values_file = self.context.app.cwd / values_file
 
-        repository_hash = self._add_repository(repository)
+        version_spec = []
+        if repository:
+            repository_hash = self._add_repository(repository)
+            chart_name = f"{repository_hash}/{chart}"
+        else:
+            chart_name = chart
+
+        if version:
+            version_spec = ["--version", version]
+
         stdin = DEVNULL
 
         if values:
@@ -237,11 +254,11 @@ class HelmPlugin(KubernatorPlugin):
         resources = self.context.app.run_capturing_out(self.stanza() +
                                                        ["template",
                                                         name,
-                                                        f"{repository_hash}/{chart}",
-                                                        "--version", version,
+                                                        chart_name,
                                                         "-n", namespace,
                                                         "-a", ",".join(self.context.k8s.get_api_versions())
                                                         ] +
+                                                       version_spec +
                                                        (["--include-crds"] if include_crds else []) +
                                                        (["-f", values_file] if values_file else []) +
                                                        (["-f", "-"] if values else []),

{kubernator-1.0.19.dist-info → kubernator-1.0.20.dev20250518194115.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kubernator
-Version: 1.0.19
+Version: 1.0.20.dev20250518194115
 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.19.dist-info → kubernator-1.0.20.dev20250518194115.dist-info}/RECORD

@@ -1,16 +1,16 @@
 kubernator/LICENSE,sha256=wKKdOCMTCPQRV5gDkVLAsXX8qSnRJ5owk7yWPO1KZNo,11387
-kubernator/__init__.py,sha256=duuVfh5GQfMf7MLTgT0Z4gBctSSYsLpb3NB_ALXBXXc,915
+kubernator/__init__.py,sha256=3I8NxAiSeKmmDgyNzoooHnO6JlQ6jMZq5KqCGjYos7M,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=kEmfsSbiNxogn-ZG2n7_m93yF-Wg9379sMUySnNGaSY,26736
+kubernator/api.py,sha256=cU_dsS4PcTkRUcQqnRxsaqzeoApjhwRd2-l4CfwFZpU,27201
 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
 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/helm.py,sha256=8oa2LJoGd1-b9_e-PW2c5--zNaYZTykIFtgX0u5VHIw,11136
 kubernator/plugins/istio.py,sha256=oERwbVtIk9vMJp_miBXK3-XJKF6SDbh6PPe0p3QIekY,14924
 kubernator/plugins/k8s.py,sha256=Zj3q_bUmbOADfjSHy2X0BhgrbXuH-fM8Vq75sYFy0nE,24496
 kubernator/plugins/k8s_api.py,sha256=w2aB7CU0rPqRgzhI5mLMJUUSpWlJGCsX_bHl4SjfzM8,27594
@@ -21,10 +21,10 @@ kubernator/plugins/minikube.py,sha256=FFGW8Rkap4CPEydEgxXhIuK3A263khjli0adC5j09M
 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.19.dist-info/METADATA,sha256=PQA5hiQ6BleRPIBWyJ2KxhEedHOznols8arye8gur0A,10849
-kubernator-1.0.19.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-kubernator-1.0.19.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
-kubernator-1.0.19.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.19.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
-kubernator-1.0.19.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.19.dist-info/RECORD,,
+kubernator-1.0.20.dev20250518194115.dist-info/METADATA,sha256=4EpIoRQfCd8qIruzqksTd6DwfElkEN9LswQWSotwswE,10867
+kubernator-1.0.20.dev20250518194115.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+kubernator-1.0.20.dev20250518194115.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
+kubernator-1.0.20.dev20250518194115.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+kubernator-1.0.20.dev20250518194115.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
+kubernator-1.0.20.dev20250518194115.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+kubernator-1.0.20.dev20250518194115.dist-info/RECORD,,

{kubernator-1.0.19.dist-info → kubernator-1.0.20.dev20250518194115.dist-info}/WHEEL

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