kubernator 1.0.17.dev20240913212240__tar.gz → 1.0.18__tar.gz

{kubernator-1.0.17.dev20240913212240 → kubernator-1.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: kubernator
-Version: 1.0.17.dev20240913212240
+Version: 1.0.18
 Summary: Kubernator is the a pluggable framework for K8S provisioning
 Home-page: https://github.com/karellen/kubernator
 Author: Express Systems USA, Inc.
@@ -17,6 +17,7 @@ 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: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: POSIX :: Linux
@@ -40,11 +41,24 @@ 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: kubernetes~=31.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.17.dev20240913212240 → kubernator-1.0.18}/kubernator/__init__.py

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

{kubernator-1.0.17.dev20240913212240 → kubernator-1.0.18}/kubernator/plugins/istio.py

@@ -53,6 +53,9 @@ class IstioPlugin(KubernatorPlugin, K8SResourcePluginMixin):
         self.client_version = None
         self.server_version = None
         self.provision_operator = False
+        self.install = False
+        self.upgrade = False
+        self.upgrade_from_operator = False
         self.template_engine = TemplateEngine(logger)
 
         self.istioctl_dir = None
@@ -133,25 +136,41 @@ class IstioPlugin(KubernatorPlugin, K8SResourcePluginMixin):
         context = self.context
 
         version, version_out_js = self.test_istioctl()
-        self.client_version = tuple(version.split("."))
-        mesh_versions = set(tuple(m.value.split(".")) for m in MESH_PILOT_JP.find(version_out_js))
+        self.client_version = tuple(map(int, version.split(".")))
+        mesh_versions = set(tuple(map(int, m.value.split("."))) for m in MESH_PILOT_JP.find(version_out_js))
 
         if mesh_versions:
             self.server_version = max(mesh_versions)
 
         if not self.server_version:
             logger.info("No Istio mesh has been found and it'll be created")
+            self.install = True
             self.provision_operator = True
-        elif self.server_version < self.client_version:
-            logger.info("Istio client is version %s while server is up to %s - operator will be upgraded",
-                        ".".join(self.client_version),
-                        ".".join(self.server_version))
+        elif self.server_version != self.client_version:
+            logger.info("Istio client is version %s while server is up to %s - up/downgrade will be performed",
+                        ".".join(map(str, self.client_version)),
+                        ".".join(map(str, self.server_version)))
+            self.upgrade = True
             self.provision_operator = True
 
+        if self.client_version >= (1, 24, 0):
+            # No more operator in 1.24.0+
+            self.provision_operator = False
+
+        if self.upgrade and (self.client_version >= (1, 24, 0) > self.server_version):
+            self.upgrade_from_operator = True
+
+        if self.upgrade and (self.client_version < (1, 24, 0) <= self.server_version):
+            raise ValueError(f"Unable to downgrade Istio from {self.server_version} to {self.client_version}")
+
         # Register Istio-related CRDs with K8S
+        if self.client_version >= (1, 24, 0):
+            crd_path = "manifests/charts/base/files/crd-all.gen.yaml"
+        else:
+            crd_path = "manifests/charts/base/crds/crd-all.gen.yaml"
         self.context.k8s.load_remote_crds(
-            f"https://raw.githubusercontent.com/istio/istio/{'.'.join(self.client_version)}/"
-            "manifests/charts/base/crds/crd-all.gen.yaml", "yaml")
+            f"https://raw.githubusercontent.com/istio/istio/{'.'.join(map(str, self.client_version))}/{crd_path}",
+            "yaml")
 
         # This plugin only deals with Istio Operator, so only load that stuff
         self.resource_definitions_schema = load_remote_file(logger,
@@ -161,8 +180,10 @@ class IstioPlugin(KubernatorPlugin, K8SResourcePluginMixin):
                                                             FileType.JSON)
         self._populate_resource_definitions()
 
-        self.add_remote_crds(f"https://raw.githubusercontent.com/istio/istio/{'.'.join(self.client_version)}/"
-                             f"manifests/charts/istio-operator/crds/crd-operator.yaml", FileType.YAML)
+        crd_operator_version = (1, 23, 4) if self.client_version >= (1, 24, 0) else self.client_version
+        self.add_remote_crds(
+            f"https://raw.githubusercontent.com/istio/istio/{'.'.join(map(str, crd_operator_version))}/"
+            f"manifests/charts/istio-operator/crds/crd-operator.yaml", FileType.YAML)
 
         # Exclude Istio YAMLs from K8S resource loading
         context.k8s.default_excludes.add("*.istio.yaml")
@@ -211,40 +232,117 @@ class IstioPlugin(KubernatorPlugin, K8SResourcePluginMixin):
                 context.app.run(context.istio.stanza() + ["validate", "-f", operators_file.name],
                                 stdout_logger, stderr_logger).wait()
 
-                self._operator_init(operators_file, True)
-
-                if not context.app.args.dry_run:
-                    self._operator_init(operators_file, False)
-
-    def _operator_init(self, operators_file, dry_run):
+                dry_run = context.app.args.dry_run
+
+                if self.provision_operator:
+                    self._create_istio_system_ns(True)
+                    self._operator_init(operators_file, True)
+
+                    if not dry_run:
+                        self._create_istio_system_ns(False)
+                        self._operator_init(operators_file, False)
+                elif self.install:
+                    self._install(operators_file, True)
+
+                    if not dry_run:
+                        self._install(operators_file, False)
+                elif self.upgrade:
+                    def _upgrade(dry_run):
+                        if self.upgrade_from_operator:
+                            # delete deployment -n istio-system istio-operator
+                            self._delete_resource_internal({"apiVersion": "apps/v1",
+                                                            "kind": "Deployment",
+                                                            "metadata":
+                                                                {
+                                                                    "namespace": "istio-system",
+                                                                    "name": "istio-operator"
+                                                                }
+                                                            }, dry_run, True)
+                        self._upgrade(operators_file, dry_run)
+
+                    _upgrade(True)
+                    if not dry_run:
+                        _upgrade(False)
+
+    def _delete_resource_internal(self, manifest, dry_run=True, missing_ok=False):
         from kubernetes import client
         from kubernetes.client.rest import ApiException
 
         context = self.context
+        k8s_client = context.k8s.client
 
-        status_details = " (dry run)" if dry_run else ""
+        res = self._create_resource(manifest)
+        res.rdef.populate_api(client, k8s_client)
+        try:
+            res.delete(dry_run=dry_run)
+        except ApiException as e:
+            skip = False
+            if e.status == 404 and missing_ok:
+                skip = True
+            if not skip:
+                raise
+        return res
+
+    def _create_resource_internal(self, manifest, dry_run=True, exists_ok=False):
+        from kubernetes import client
+        from kubernetes.client.rest import ApiException
 
+        context = self.context
         k8s_client = context.k8s.client
-        logger.info("Creating istio-system namespace%s", status_details)
-        istio_system = self.add_resource({"apiVersion": "v1",
-                                          "kind": "Namespace",
-                                          "metadata": {
-                                              "labels": {
-                                                  "istio-injection": "disabled"
-                                              },
-                                              "name": "istio-system"
-                                          }})
-        istio_system.rdef.populate_api(client, k8s_client)
+
+        res = self._create_resource(manifest)
+        res.rdef.populate_api(client, k8s_client)
         try:
-            istio_system.create(dry_run=dry_run)
+            res.create(dry_run=dry_run)
         except ApiException as e:
             skip = False
             if e.status == 409:
                 status = json.loads(e.body)
-                if status["reason"] == "AlreadyExists":
+                if status["reason"] == "AlreadyExists" and exists_ok:
                     skip = True
             if not skip:
                 raise
+        return res
+
+    def _install(self, operators_file, dry_run):
+        context = self.context
+        status_details = " (dry run)" if dry_run else ""
+
+        logger.info("Running Istio install%s", status_details)
+        istio_install_cmd = context.istio.stanza() + ["install", "-f", operators_file.name, "-y", "--verify"]
+        context.app.run(istio_install_cmd + (["--dry-run"] if dry_run else []),
+                        stdout_logger,
+                        stderr_logger).wait()
+
+    def _upgrade(self, operators_file, dry_run):
+        context = self.context
+        status_details = " (dry run)" if dry_run else ""
+
+        logger.info("Running Istio upgrade%s", status_details)
+        istio_upgrade_cmd = context.istio.stanza() + ["upgrade", "-f", operators_file.name, "-y", "--verify"]
+        context.app.run(istio_upgrade_cmd + (["--dry-run"] if dry_run else []),
+                        stdout_logger,
+                        stderr_logger).wait()
+
+    def _create_istio_system_ns(self, dry_run):
+        status_details = " (dry run)" if dry_run else ""
+        logger.info("Creating istio-system namespace%s", status_details)
+        self._create_resource_internal({"apiVersion": "v1",
+                                        "kind": "Namespace",
+                                        "metadata": {
+                                            "labels": {
+                                                "istio-injection": "disabled"
+                                            },
+                                            "name": "istio-system"
+                                        }
+                                        },
+                                       dry_run=dry_run,
+                                       exists_ok=True
+                                       )
+
+    def _operator_init(self, operators_file, dry_run):
+        context = self.context
+        status_details = " (dry run)" if dry_run else ""
 
         logger.info("Running Istio operator init%s", status_details)
         istio_operator_init = context.istio.stanza() + ["operator", "init", "-f", operators_file.name]

{kubernator-1.0.17.dev20240913212240 → kubernator-1.0.18}/kubernator/plugins/minikube.py

@@ -206,7 +206,12 @@ class MinikubePlugin(KubernatorPlugin):
         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-1.0.17.dev20240913212240 → kubernator-1.0.18}/kubernator.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: kubernator
-Version: 1.0.17.dev20240913212240
+Version: 1.0.18
 Summary: Kubernator is the a pluggable framework for K8S provisioning
 Home-page: https://github.com/karellen/kubernator
 Author: Express Systems USA, Inc.
@@ -17,6 +17,7 @@ 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: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: POSIX :: Linux
@@ -40,11 +41,24 @@ 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: kubernetes~=31.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.17.dev20240913212240 → kubernator-1.0.18}/kubernator.egg-info/requires.txt

@@ -7,7 +7,7 @@ json-log-formatter~=0.3
 jsonpatch~=1.32
 jsonpath-ng~=1.6.1
 jsonschema<4.0
-kubernetes~=30.0
+kubernetes~=31.0
 openapi-schema-validator~=0.1
 openapi-spec-validator~=0.3
 platformdirs~=4.2

{kubernator-1.0.17.dev20240913212240 → kubernator-1.0.18}/setup.py

@@ -21,7 +21,7 @@ class install(_install):
 if __name__ == '__main__':
     setup(
         name = 'kubernator',
-        version = '1.0.17.dev20240913212240',
+        version = '1.0.18',
         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',
@@ -31,6 +31,7 @@ if __name__ == '__main__':
             'Programming Language :: Python :: 3.10',
             'Programming Language :: Python :: 3.11',
             'Programming Language :: Python :: 3.12',
+            'Programming Language :: Python :: 3.13',
             'Operating System :: MacOS :: MacOS X',
             'Operating System :: POSIX',
             'Operating System :: POSIX :: Linux',
@@ -84,7 +85,7 @@ if __name__ == '__main__':
             'jsonpatch~=1.32',
             'jsonpath-ng~=1.6.1',
             'jsonschema<4.0',
-            'kubernetes~=30.0',
+            'kubernetes~=31.0',
             'openapi-schema-validator~=0.1',
             'openapi-spec-validator~=0.3',
             'platformdirs~=4.2',