kubernator 1.0.17__py3-none-any.whl → 1.0.18__py3-none-any.whl

kubernator/__init__.py

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

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/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.dist-info → kubernator-1.0.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: kubernator
-Version: 1.0.17
+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.dist-info → kubernator-1.0.18.dist-info}/RECORD

@@ -1,5 +1,5 @@
 kubernator/LICENSE,sha256=wKKdOCMTCPQRV5gDkVLAsXX8qSnRJ5owk7yWPO1KZNo,11387
-kubernator/__init__.py,sha256=gAjhdip8fRJb9Pn3h8PXD--afamYsaBOkCNxZTJKDXA,915
+kubernator/__init__.py,sha256=q_EQvqE0BEzKg1O9XRY-Jf9qwqj0hyUWOYmGyiBS6LA,915
 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
@@ -11,20 +11,20 @@ kubernator/plugins/__init__.py,sha256=h9TLYK8UFEi53ipZSZsTBjp0ljKhisWsgPpt_PkWrO
 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/istio.py,sha256=hD-VCNVGELt7cGFbE7S7dTiqKE7rfhzE8qA9X5tsllE,10532
+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
 kubernator/plugins/kops.py,sha256=QsrQJUF6wGJo2QRVqP92pG5vmOTYQIc25PD_DWCzrAA,9635
 kubernator/plugins/kubeconfig.py,sha256=uwtHmF2I6LiTPrC3M88G5SfYxDWtuh0MqcMfrHHoNRA,2178
 kubernator/plugins/kubectl.py,sha256=IgNghW1Q6s8V2o08eNY2NWfkkdV9Z6X2A3YFQinFr4g,4028
-kubernator/plugins/minikube.py,sha256=kWPDIS4X1JnEoXw_rIOvgvFtjJMch39uL0mD7gQwtjE,10162
+kubernator/plugins/minikube.py,sha256=FFGW8Rkap4CPEydEgxXhIuK3A263khjli0adC5j09MA,10393
 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.17.dist-info/METADATA,sha256=mnATlQPIcepM7Xnt81EwQVC10W02martshWA5wxSx20,10521
-kubernator-1.0.17.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-kubernator-1.0.17.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
-kubernator-1.0.17.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.17.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
-kubernator-1.0.17.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.17.dist-info/RECORD,,
+kubernator-1.0.18.dist-info/METADATA,sha256=S08Bo0xGauR48XowvDFNMoX8vCGEJQUfdWqvF-4AYHE,10849
+kubernator-1.0.18.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+kubernator-1.0.18.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
+kubernator-1.0.18.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+kubernator-1.0.18.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
+kubernator-1.0.18.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+kubernator-1.0.18.dist-info/RECORD,,

{kubernator-1.0.17.dist-info → kubernator-1.0.18.dist-info}/WHEEL

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