kubernator 1.0.0.dev20211022025240__py3-none-any.whl → 1.0.0.dev20230807194830__py3-none-any.whl

kubernator/__main__.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+#
+#   Copyright 2020 Express Systems USA, Inc
+#   Copyright 2023 Karellen, Inc.
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+from kubernator import main
+
+main()

kubernator/api.py

@@ -42,7 +42,7 @@ from jinja2 import (Environment,
                     ChainableUndefined,
                     make_logging_undefined,
                     Template as JinjaTemplate,
-                    contextfunction)
+                    pass_context)
 from jsonschema import validators
 
 _CACHE_HEADER_TRANSLATION = {"etag": "if-none-match",
@@ -327,7 +327,7 @@ class TemplateEngine:
             base=CollectingUndefined
         )
 
-        @contextfunction
+        @pass_context
         def variable_finalizer(ctx, value):
             normalized_value = str(value)
             if self.VARIABLE_START_STRING in normalized_value and self.VARIABLE_END_STRING in normalized_value:

kubernator/app.py

@@ -282,7 +282,7 @@ class App(KubernatorPlugin):
                            default_includes=Globs(context.app.default_includes),
                            default_excludes=Globs(context.app.default_excludes),
                            includes=Globs(context.app.default_includes),
-                           excludes=Globs(context.app.default_includes),
+                           excludes=Globs(context.app.default_excludes),
                            )
 
     def handle_before_dir(self, cwd: Path):

kubernator/istio.py

@@ -74,11 +74,13 @@ class IstioPlugin(KubernatorPlugin, K8SResourcePluginMixin):
         version_out: str = context.app.run_capturing_out(self.istio_stanza + ["version", "-o", "json"],
                                                          stderr_logger)
 
-        version = json.loads(version_out)["clientVersion"]["version"]
+        version_out_js = json.loads(version_out)
+        version = version_out_js["clientVersion"]["version"]
         logger.info("Found Istio client version %s", version)
 
-        self.client_version = version.split(".")
-        mesh_versions = set(m.value.split(".") for m in MESH_PILOT_JP.find(version_out))
+        self.client_version = tuple(version.split("."))
+        mesh_versions = set(tuple(m.value.split(".")) for m in MESH_PILOT_JP.find(version_out_js))
+
         if mesh_versions:
             self.server_version = max(mesh_versions)
 
@@ -141,7 +143,9 @@ class IstioPlugin(KubernatorPlugin, K8SResourcePluginMixin):
 
             if context.app.args.command == "apply":
                 logger.info("Running Istio precheck")
-                context.app.run(self.istio_stanza + ["x", "precheck", "-f", operators_file.name],
+                context.app.run(self.istio_stanza + ["x", "precheck"],
+                                stdout_logger, stderr_logger).wait()
+                context.app.run(self.istio_stanza + ["validate", "-f", operators_file.name],
                                 stdout_logger, stderr_logger).wait()
 
                 self._operator_init(operators_file, True)

{kubernator-1.0.0.dev20211022025240.dist-info → kubernator-1.0.0.dev20230807194830.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kubernator
-Version: 1.0.0.dev20211022025240
+Version: 1.0.0.dev20230807194830
 Summary: Kubernator is the a pluggable framework for K8S provisioning
 Home-page: https://github.com/karellen/kubernator
 Author: Express Systems USA, Inc.
@@ -12,10 +12,10 @@ 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
-Platform: UNKNOWN
 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: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: POSIX :: Linux
@@ -33,7 +33,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: appdirs (~=1.4)
 Requires-Dist: coloredlogs (~=15.0)
 Requires-Dist: gevent (>=21.1.2)
-Requires-Dist: jinja2 (~=2.11)
+Requires-Dist: jinja2 (~=3.1)
 Requires-Dist: json-log-formatter (~=0.3)
 Requires-Dist: jsonpatch (~=1.32)
 Requires-Dist: jsonpath-ng (~=1.5)
@@ -50,7 +50,7 @@ processing their content via a collection of plugins, generating Kubernetes reso
 transforming them and then applying against the Kubernetes cluster.
 
 [![Gitter](https://img.shields.io/gitter/room/karellen/lobby?logo=gitter)](https://gitter.im/karellen/Lobby)
-[![Build Status](https://img.shields.io/github/workflow/status/karellen/kubernator/kubernator/master)](https://github.com/karellen/kubernator/actions/workflows/kubernator.yml)
+[![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)
 [![Coverage Status](https://img.shields.io/coveralls/github/karellen/kubernator/master?logo=coveralls)](https://coveralls.io/r/karellen/kubernator?branch=master)
 
 [![Kubernator Version](https://img.shields.io/pypi/v/kubernator?logo=pypi)](https://pypi.org/project/kubernator/)
@@ -227,5 +227,3 @@ def remove_replicas(resources, r: "K8SResource"):
 
 ktor.k8s.add_transformer(remove_replicas)
 ```
-
-

kubernator-1.0.0.dev20230807194830.dist-info/RECORD

@@ -0,0 +1,20 @@
+kubernator/LICENSE,sha256=wKKdOCMTCPQRV5gDkVLAsXX8qSnRJ5owk7yWPO1KZNo,11387
+kubernator/__init__.py,sha256=UafMh9ExywKbqCaPwrhnvkmtsH1E0QqkJltHHW-dhZg,886
+kubernator/__main__.py,sha256=f0S60wgpLu--1UlOhzfWail-xt8zyIuODodX98_yPN0,707
+kubernator/api.py,sha256=wT39HqwS_AE8dm_fLQs-OvcFAQiY9ZTz4jczYpTi8G4,15516
+kubernator/app.py,sha256=iVR6re_LBYFo6PIip7_w5OmQmsAc0SYmn6fVCfPdy04,15518
+kubernator/helm.py,sha256=vWiZKOuqMkA5EuZHAvsx7GjI0c1B3S7GkbdYpCOpYm0,8757
+kubernator/istio.py,sha256=q81QgbeZRTWpkn-SABuRKB6X-sV9H-eoyrdAipyZY2A,7815
+kubernator/k8s.py,sha256=yUsiq0GRprxUKJ_wrDlA9rD7Hb6i91jMyIDjtq3OMSo,18588
+kubernator/k8s_api.py,sha256=sNuTlbfqDjXF7xgUePZBfJ_3Gbuk5V1AbrlCunCgTYc,25906
+kubernator/kops.py,sha256=QqcH3DzJgFlNfaaHQb4T_UCpxcphH0F9cH4QDXf_Ngc,9430
+kubernator/proc.py,sha256=MNJwcpSwY_j-WfxEtI3CIhC59rID47GQwUMOFiIQEMk,5131
+kubernator/template.py,sha256=W7YB9CbolWin0cXuIU_Z0y7c6tO4Lu7DbcoycYHTw38,8045
+kubernator/tf.py,sha256=nmX193EH0h3RFPa2j6u5QVjM2L111yOqOithxfgUEuU,2449
+kubernator-1.0.0.dev20230807194830.dist-info/METADATA,sha256=zuJq9DMFr2lD_xlxcCepKx5wGDd5Ik18X_XB1KhE20g,9961
+kubernator-1.0.0.dev20230807194830.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+kubernator-1.0.0.dev20230807194830.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
+kubernator-1.0.0.dev20230807194830.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+kubernator-1.0.0.dev20230807194830.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
+kubernator-1.0.0.dev20230807194830.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+kubernator-1.0.0.dev20230807194830.dist-info/RECORD,,

{kubernator-1.0.0.dev20211022025240.dist-info → kubernator-1.0.0.dev20230807194830.dist-info}/WHEEL

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

{kubernator-1.0.0.dev20211022025240.dist-info → kubernator-1.0.0.dev20230807194830.dist-info}/entry_points.txt

@@ -1,3 +1,2 @@
 [console_scripts]
 kubernator = kubernator:main
-

kubernator-1.0.0.dev20211022025240.dist-info/RECORD

@@ -1,19 +0,0 @@
-kubernator/LICENSE,sha256=wKKdOCMTCPQRV5gDkVLAsXX8qSnRJ5owk7yWPO1KZNo,11387
-kubernator/__init__.py,sha256=UafMh9ExywKbqCaPwrhnvkmtsH1E0QqkJltHHW-dhZg,886
-kubernator/api.py,sha256=hTBo8cdBK-x7-1KGfMq9KNNm2Oebru1e9ux3HM9ydTQ,15522
-kubernator/app.py,sha256=hOJQEGhsvTM_PrPAzMU_2w-XFDlNn32vPO4EpfUg7lo,15518
-kubernator/helm.py,sha256=vWiZKOuqMkA5EuZHAvsx7GjI0c1B3S7GkbdYpCOpYm0,8757
-kubernator/istio.py,sha256=YuxLibXu0wAypUEvASuQ6uRnXvzAJuDId1laLfAq5vQ,7622
-kubernator/k8s.py,sha256=yUsiq0GRprxUKJ_wrDlA9rD7Hb6i91jMyIDjtq3OMSo,18588
-kubernator/k8s_api.py,sha256=sNuTlbfqDjXF7xgUePZBfJ_3Gbuk5V1AbrlCunCgTYc,25906
-kubernator/kops.py,sha256=QqcH3DzJgFlNfaaHQb4T_UCpxcphH0F9cH4QDXf_Ngc,9430
-kubernator/proc.py,sha256=MNJwcpSwY_j-WfxEtI3CIhC59rID47GQwUMOFiIQEMk,5131
-kubernator/template.py,sha256=W7YB9CbolWin0cXuIU_Z0y7c6tO4Lu7DbcoycYHTw38,8045
-kubernator/tf.py,sha256=nmX193EH0h3RFPa2j6u5QVjM2L111yOqOithxfgUEuU,2449
-kubernator-1.0.0.dev20211022025240.dist-info/METADATA,sha256=2vCINHYnOT5d4O29md-xVPai6RaWvvJdfj5An3-gj_Y,9912
-kubernator-1.0.0.dev20211022025240.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
-kubernator-1.0.0.dev20211022025240.dist-info/entry_points.txt,sha256=0Hy6500stC827jQNjnMyH1PoglDJBnaIzRUBbOw8Vvg,48
-kubernator-1.0.0.dev20211022025240.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.0.dev20211022025240.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
-kubernator-1.0.0.dev20211022025240.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.0.dev20211022025240.dist-info/RECORD,,