kubernator 1.0.0.dev20230807191813__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/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.dev20230807191813.dist-info → kubernator-1.0.0.dev20230807194830.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kubernator
-Version: 1.0.0.dev20230807191813
+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.
@@ -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/)

{kubernator-1.0.0.dev20230807191813.dist-info → kubernator-1.0.0.dev20230807194830.dist-info}/RECORD

@@ -1,19 +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=hOJQEGhsvTM_PrPAzMU_2w-XFDlNn32vPO4EpfUg7lo,15518
+kubernator/app.py,sha256=iVR6re_LBYFo6PIip7_w5OmQmsAc0SYmn6fVCfPdy04,15518
 kubernator/helm.py,sha256=vWiZKOuqMkA5EuZHAvsx7GjI0c1B3S7GkbdYpCOpYm0,8757
-kubernator/istio.py,sha256=YuxLibXu0wAypUEvASuQ6uRnXvzAJuDId1laLfAq5vQ,7622
+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.dev20230807191813.dist-info/METADATA,sha256=ztMw5dAkAxFzpu-ebw5zDYqZ-0EXl2uGPaUz3-D7zFI,9942
-kubernator-1.0.0.dev20230807191813.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-kubernator-1.0.0.dev20230807191813.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
-kubernator-1.0.0.dev20230807191813.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.0.dev20230807191813.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
-kubernator-1.0.0.dev20230807191813.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.0.dev20230807191813.dist-info/RECORD,,
+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,,