kubernator 1.0.19__tar.gz → 1.0.20__tar.gz

{kubernator-1.0.19 → kubernator-1.0.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kubernator
-Version: 1.0.19
+Version: 1.0.20
 Summary: Kubernator is the a pluggable framework for K8S provisioning
 Home-page: https://github.com/karellen/kubernator
 Author: Express Systems USA, Inc.
@@ -38,9 +38,9 @@ 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: 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

{kubernator-1.0.19 → kubernator-1.0.20}/kubernator/__init__.py

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

{kubernator-1.0.19 → kubernator-1.0.20}/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-1.0.19 → kubernator-1.0.20}/kubernator/plugins/helm.py

@@ -27,7 +27,7 @@ from shutil import which, copy
 from typing import Sequence
 
 import yaml
-from jsonschema import Draft7Validator, draft7_format_checker
+from jsonschema import Draft7Validator
 
 from kubernator.api import (KubernatorPlugin, Globs, StripNL,
                             scan_dir,
@@ -85,12 +85,12 @@ HELM_SCHEMA = {
         }
     },
     "type": "object",
-    "required": ["repository", "chart", "version", "name", "namespace"]
+    "required": ["chart", "name", "namespace"]
 }
 
 Draft7Validator.check_schema(HELM_SCHEMA)
 HELM_VALIDATOR_CLS = validator_with_defaults(Draft7Validator)
-HELM_VALIDATOR = HELM_VALIDATOR_CLS(HELM_SCHEMA, format_checker=draft7_format_checker)
+HELM_VALIDATOR = HELM_VALIDATOR_CLS(HELM_SCHEMA, format_checker=Draft7Validator.FORMAT_CHECKER)
 
 
 class HelmPlugin(KubernatorPlugin):
@@ -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 → kubernator-1.0.20}/kubernator/plugins/k8s_api.py

@@ -29,11 +29,10 @@ from typing import Union, Optional
 
 import yaml
 from jsonschema._format import FormatChecker
-from jsonschema._types import int_types, str_types
-from jsonschema._validators import required
+from jsonschema._keywords import required
 from jsonschema.exceptions import ValidationError
-from jsonschema.validators import extend, Draft7Validator, RefResolver
-from openapi_schema_validator import OAS30Validator
+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
 
@@ -89,11 +88,11 @@ def is_integer(instance):
     # bool inherits from int, so ensure bools aren't reported as ints
     if isinstance(instance, bool):
         return False
-    return isinstance(instance, int_types)
+    return isinstance(instance, int)
 
 
 def is_string(instance):
-    return isinstance(instance, str_types)
+    return isinstance(instance, str)
 
 
 def type_validator(validator, data_type, instance, schema):
@@ -107,7 +106,7 @@ def type_validator(validator, data_type, instance, schema):
         yield ValidationError("%r is not of type %s" % (instance, data_type))
 
 
-K8SValidator = extend(OAS30Validator, validators={
+K8SValidator = extend(OAS31Validator, validators={
     "type": type_validator,
     "required": required
 })
@@ -148,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:
@@ -663,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):
@@ -744,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-1.0.19 → kubernator-1.0.20}/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-1.0.19 → kubernator-1.0.20}/kubernator.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kubernator
-Version: 1.0.19
+Version: 1.0.20
 Summary: Kubernator is the a pluggable framework for K8S provisioning
 Home-page: https://github.com/karellen/kubernator
 Author: Express Systems USA, Inc.
@@ -38,9 +38,9 @@ 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: 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

{kubernator-1.0.19 → kubernator-1.0.20}/kubernator.egg-info/requires.txt

@@ -4,9 +4,9 @@ durationpy>=0.7
 gevent>=21.1.2
 jinja2~=3.1
 json-log-formatter~=0.3
-jsonpatch~=1.32
-jsonpath-ng~=1.6.1
-jsonschema<4.0
+jsonpatch~=1.33
+jsonpath-ng~=1.7.0
+jsonschema~=4.23
 kubernetes~=32.0
 openapi-schema-validator~=0.1
 openapi-spec-validator~=0.3

{kubernator-1.0.19 → kubernator-1.0.20}/setup.py

@@ -21,7 +21,7 @@ class install(_install):
 if __name__ == '__main__':
     setup(
         name = 'kubernator',
-        version = '1.0.19',
+        version = '1.0.20',
         description = 'Kubernator is the a pluggable framework for K8S provisioning',
         long_description = '# Kubernator\n\nKubernator™ (Ktor™) is an integrated solution for the Kubernetes state management. It operates on directories,\nprocessing their content via a collection of plugins, generating Kubernetes resources in the process, validating them,\ntransforming them and then applying against the Kubernetes cluster.\n\n[![Gitter](https://img.shields.io/gitter/room/karellen/lobby?logo=gitter)](https://gitter.im/karellen/Lobby)\n[![Build Status](https://img.shields.io/github/actions/workflow/status/karellen/kubernator/kubernator.yml?branch=master)](https://github.com/karellen/kubernator/actions/workflows/kubernator.yml)\n[![Coverage Status](https://img.shields.io/coveralls/github/karellen/kubernator/master?logo=coveralls)](https://coveralls.io/r/karellen/kubernator?branch=master)\n\n[![Kubernator Version](https://img.shields.io/pypi/v/kubernator?logo=pypi)](https://pypi.org/project/kubernator/)\n[![Kubernator Python Versions](https://img.shields.io/pypi/pyversions/kubernator?logo=pypi)](https://pypi.org/project/kubernator/)\n[![Kubernator Downloads Per Day](https://img.shields.io/pypi/dd/kubernator?logo=pypi)](https://pypi.org/project/kubernator/)\n[![Kubernator Downloads Per Week](https://img.shields.io/pypi/dw/kubernator?logo=pypi)](https://pypi.org/project/kubernator/)\n[![Kubernator Downloads Per Month](https://img.shields.io/pypi/dm/kubernator?logo=pypi)](https://pypi.org/project/kubernator/)\n\n## Notices\n\n### Beta Software\n\nWhile fully functional in the current state and used in production, this software is in **BETA**. A lot of things\nare expected to change rapidly, including main APIs, initialization procedures and some core features. Documentation at\nthis stage is basically non-existent.\n\n### License\n\nThe product is licensed under the Apache License, Version 2.0. Please see LICENSE for further details.\n\n### Warranties and Liability\n\nKubernator and its plugins are provided on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either\nexpress or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT,\nMERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of\nusing or redistributing Kubernator and assume any risks associated with doing so.\n\n### Trademarks\n\n"Kubernator" and "Ktor" are trademarks or registered trademarks of Express Systems USA, Inc and Karellen, Inc. All other\ntrademarks are property of their respective owners.\n\n## Problem Statement\n\n## Solution\n\n## Using Kubernator with Docker\n\nA simple example is as follows:\n```\n$ docker run --mount type=bind,source="$(pwd)",target=/root,readonly -t ghcr.io/karellen/kubernator:latest\n```\n\n## Using Kubernator on MacOS\n\n```\n$ brew install python3.11\n$ pip3.11 install \'kubernator~=1.0.9\'\n$ kubernator --version\n```\n\nPlease note, that some plugins (e.g. `awscli`, `eks`) may require additional volume mounts or environmental\nvariables to be passed for credentials and other external configuration.\n\n## Mode of Operation\n\nKubernator is a command line utility. Upon startup and processing of the command line arguments and initializing\nlogging, Kubernator initializes plugins. Current plugins include:\n\n0. Kubernator App\n1. Terraform\n2. kOps\n3. Kubernetes\n4. Helm\n5. Template\n\nThe order of initialization matters as it\'s the order the plugin handlers are executed!\n\nThe entire application operates in the following stages by invoking each plugin\'s stage handler in sequence:\n\n1. Plugin Init Stage\n2. Pre-start script (if specified)\n3. Plugin Start Stage\n4. For each directory in the pipeline:\n    1. Plugin Before Directory Stage\n    2. If `.kubernator.py` is present in the directory:\n        1. Plugin Before Script Stage\n        2. `.kubernator.py` script\n        3. Plugin After Script Stage\n    3. Plugin After Directory Stage\n5. Plugin End Stage\n\nEach plugin individually plays a specific role and performs a specific function which will be described in a later\nsection.\n\n## State/Context\n\nThere is a global state that is carried through as the application is running. It is a hierarchy of objects (`context`)\nthat follows the parent-child relationship as the application traverses the directory structure. For example, given the\ndirectory structure `/a/b`, `/a/c`, and `/a/c/d` any value of the context set or modified in context scoped to\ndirectory `/a` is visible in directories `/a/b`, `/a/c` and `/a/c/d`, while the same modified or set in `/a/b` is only\nvisible there, while one in `/a/c` is visible in `/a/c` and in `/a/c/d` but not `/a` or `/a/b`.\n\nAdditionally, there is a `context.globals` which is the top-most context that is available in all stages that are not\nassociated with the directory structure.\n\nNote, that in cases where the directory structure traversal moves to remote directories (that are actualized by local\ntemporary directories), such remote directory structure enters the context hierarchy as a child of the directory in\nwhich remote was registered.\n\nAlso note, that context carries not just data by references to essential functions.\n\nIn pre-start and `.kubernator.py` scripts the context is fully available as a global variable `ktor`.\n\n### Plugins\n\n#### Kubernator App Plugin\n\nThe role of the Kubernator App Plugin is to traverse the directory structure, expose essential functions through context\nand to run Kubernator scripts.\n\nIn the *After Directory Stage* Kubernator app scans the directories immediately available in the current, sorts them in\nthe alphabetic order, excludes those matching any of the patterns in `context.app.excludes` and then queues up the\nremaining directories in the order the match the patterns in `context.app.includes`.\n\nThus, for a directory content `/a/foo`, `/a/bal`, `/a/bar`, `/a/baz`, excludes `f*`, and includes `baz` and `*`, the\nresulting queue of directories to traverse will be `/a/baz`, `/a/bal`, `/a/bar`.\n\nNotice, that user can further interfere with processing order of the directory queue by asking Kubernator to walk\narbitrary paths, both local and remote.\n\n##### Context\n\n* `ktor.app.args`\n  > Namespace containing command line argument values\n* `ktor.app.walk_local(*paths: Union[Path, str, bytes])`\n  > Immediately schedules the paths to be traversed after the current directory by adding them to the queue\n  > Relative path is relative to the current directory\n* `ktor.app.walk_remote(repo, *path_prefixes: Union[Path, str, bytes])`\n  > Immediately schedules the path prefixes under the remote repo URL to be traversed after the current directory by\n  > adding them to the queue. Only Git URLs are currently supported.\n  > All absolute path prefixes are relativized based on the repository.\n* `ktor.app.repository_credentials_provider(func: Callable)`\n  > Sets a repository credentials provider function `func` that sets/overwrites credentials for URLs being specified by\n  > `walk_remote`. The callable `func` accepts a single argument containing a parsed URL in a form of tuple. The `func`\n  > is expected to return a tuple of three elements representing URL schema, username and password. If the value should\n  > not be changed it should be None. To convert from `git://repo.com/hello` to HTTPS authentication one should write\n  > a function returning `("https", "username", "password")`. The best utility is achieved by logic that allows running\n  > the plan both in CI and local environments using different authentication mechanics in different environments.\n\n#### Terraform\n\nThis is exclusively designed to pull the configuration options out of Terraform and to allow scripts and plugins to\nutilize that data.\n\n##### Context\n\n* `ktor.tf`\n  > A dictionary containing the values from Terraform output\n\n#### Kops\n\n##### Context\n\n#### Kubernetes\n\n##### Context\n\n#### Helm\n\n##### Context\n\n#### Templates\n\n##### Context\n\n## Examples\n\n### Adding Remote Directory\n\n```python\nktor.app.repository_credentials_provider(lambda r: ("ssh", "git", None))\nktor.app.walk_remote("git://repo.example.com/org/project?ref=dev", "/project")\n```\n\n### Adding Local Directory\n\n```python\nktor.app.walk_local("/home/username/local-dir")\n```\n\n### Using Transformers\n\n```python\ndef remove_replicas(resources, r: "K8SResource"):\n    if (r.group == "apps" and r.kind in ("StatefulSet", "Deployment")\n            and "replicas" in r.manifest["spec"]):\n        logger.warning("Resource %s in %s contains `replica` specification that will be removed. Use HPA!!!",\n                       r, r.source)\n        del r.manifest["spec"]["replicas"]\n\n\nktor.k8s.add_transformer(remove_replicas)\n```\n',
         long_description_content_type = 'text/markdown',
@@ -82,9 +82,9 @@ if __name__ == '__main__':
             'gevent>=21.1.2',
             'jinja2~=3.1',
             'json-log-formatter~=0.3',
-            'jsonpatch~=1.32',
-            'jsonpath-ng~=1.6.1',
-            'jsonschema<4.0',
+            'jsonpatch~=1.33',
+            'jsonpath-ng~=1.7.0',
+            'jsonschema~=4.23',
             'kubernetes~=32.0',
             'openapi-schema-validator~=0.1',
             'openapi-spec-validator~=0.3',