kubernator 1.0.23.dev20251008231728__py3-none-any.whl → 1.0.23.dev20251010010455__py3-none-any.whl

kubernator/__init__.py

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

kubernator/plugins/k8s.py

@@ -39,7 +39,8 @@ from kubernator.api import (KubernatorPlugin,
                             load_remote_file,
                             StripNL,
                             install_python_k8s_client,
-                            TemplateEngine)
+                            TemplateEngine,
+                            sleep)
 from kubernator.merge import extract_merge_instructions, apply_merge_instructions
 from kubernator.plugins.k8s_api import (K8SResourcePluginMixin,
                                         K8SResource,
@@ -120,6 +121,7 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
                                                       ("apps", "StatefulSet"): K8SPropagationPolicy.ORPHAN,
                                                       ("apps", "Deployment"): K8SPropagationPolicy.ORPHAN,
                                                       ("storage.k8s.io", "StorageClass"): K8SPropagationPolicy.ORPHAN,
+                                                      (None, "Pod"): K8SPropagationPolicy.BACKGROUND,
                                                       },
                                    default_includes=Globs(["*.yaml", "*.yml"], True),
                                    default_excludes=Globs([".*"], True),
@@ -137,6 +139,7 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
                                    field_validation=field_validation,
                                    field_validation_warn_fatal=field_validation_warn_fatal,
                                    field_validation_warnings=0,
+                                   conflict_retry_delay=0.3,
                                    _k8s=self,
                                    )
         context.k8s = dict(default_includes=Globs(context.globals.k8s.default_includes),
@@ -199,7 +202,7 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
 
         k8s.client = self._setup_k8s_client()
         version = client.VersionApi(k8s.client).get_code()
-        if "-eks-" in version.git_version:
+        if "-eks-" or "-gke" in version.git_version:
             git_version = version.git_version.split("-")[0]
         else:
             git_version = version.git_version
@@ -425,18 +428,26 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
                                      resource, resource.source, status["message"])
                         raise e from None
 
-        def create(exists_ok=False):
+        def create(exists_ok=False, wait_for_delete=False):
             logger.info("Creating resource %s%s%s", resource, status_msg,
                         " (ignoring existing)" if exists_ok else "")
-            try:
-                create_func()
-            except ApiException as e:
-                if exists_ok:
-                    if e.status == 409:
-                        status = json.loads(e.body)
-                        if status["reason"] == "AlreadyExists":
-                            return
-                raise
+            while True:
+                try:
+                    create_func()
+                    return
+                except ApiException as e:
+                    if exists_ok or wait_for_delete:
+                        if e.status == 409:
+                            status = json.loads(e.body)
+                            if status["reason"] == "AlreadyExists":
+                                if wait_for_delete:
+                                    sleep(self.context.k8s.conflict_retry_delay)
+                                    logger.info("Retry creating resource %s%s%s", resource, status_msg,
+                                                " (ignoring existing)" if exists_ok else "")
+                                    continue
+                                else:
+                                    return
+                    raise
 
         merge_instrs, normalized_manifest = extract_merge_instructions(resource.manifest, resource)
         if merge_instrs:
@@ -471,7 +482,7 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
                 if e.status == 422:
                     status = json.loads(e.body)
                     details = status["details"]
-                    immutable_key = details["group"], details["kind"]
+                    immutable_key = details.get("group"), details["kind"]
 
                     try:
                         propagation_policy = self.context.k8s.immutable_changes[immutable_key]
@@ -484,13 +495,15 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
                                     "field is immutable" in cause["message"]
                                     or
                                     cause["reason"] == "FieldValueForbidden" and
-                                    "Forbidden: updates to" in cause["message"]
+                                    ("Forbidden: updates to" in cause["message"]
+                                     or
+                                     "Forbidden: pod updates" in cause["message"])
                             ):
                                 logger.info("Deleting resource %s (cascade %s)%s", resource,
                                             propagation_policy.policy,
                                             status_msg)
                                 delete_func(propagation_policy=propagation_policy)
-                                create(exists_ok=dry_run)
+                                create(exists_ok=dry_run, wait_for_delete=not dry_run)
                                 return 1, 0, 1
                         raise
                 else:

{kubernator-1.0.23.dev20251008231728.dist-info → kubernator-1.0.23.dev20251010010455.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kubernator
-Version: 1.0.23.dev20251008231728
+Version: 1.0.23.dev20251010010455
 Summary: Kubernator is the a pluggable framework for K8S provisioning
 Home-page: https://github.com/karellen/kubernator
 Author: Express Systems USA, Inc.

{kubernator-1.0.23.dev20251008231728.dist-info → kubernator-1.0.23.dev20251010010455.dist-info}/RECORD

@@ -1,5 +1,5 @@
 kubernator/LICENSE,sha256=wKKdOCMTCPQRV5gDkVLAsXX8qSnRJ5owk7yWPO1KZNo,11387
-kubernator/__init__.py,sha256=2aaiu4g6n1nK3G3TMavPBCgPb7S3rn_jWYKWeQaWw0I,933
+kubernator/__init__.py,sha256=FzbtCh5XegjNjaDe91xX09kYGd2bMEThMPsx_8OBoQY,933
 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
@@ -13,7 +13,7 @@ kubernator/plugins/eks.py,sha256=xe7vyPHNwuP8gEYDSzPyBkm-RkAtP64wCOqs9U5I7xI,227
 kubernator/plugins/gke.py,sha256=HZc-Bu2W8MvF50EgoAcZ8W-CAVEWJ4y8f4yG_3s8C1w,3429
 kubernator/plugins/helm.py,sha256=2563hLr0uJucw0xo9JLfbCtpGPRZ5e5gYTnapQrqy3w,12036
 kubernator/plugins/istio.py,sha256=1dHjD9r6Kk2-tw6OFMOfBpksnqGMguTyyF1FwwWEtI8,14977
-kubernator/plugins/k8s.py,sha256=XIHqFpdbRL57dnbgOonRD3Mxs9LVSUxQT-GPnpEyZyM,24762
+kubernator/plugins/k8s.py,sha256=fvmkVaBz9CuGKmu_w6S1X0tWzSQvV6S6jx8c-X_ZIXI,25673
 kubernator/plugins/k8s_api.py,sha256=PDa7MB9q3WMm_9tr8T6LY_ojrHpyGYiNTlvBZinbgFY,27379
 kubernator/plugins/kops.py,sha256=-yhpEjydz9E7Ep24WtEs93rLTXtw4yakdgVqXlIj1ww,9688
 kubernator/plugins/kubeconfig.py,sha256=uwtHmF2I6LiTPrC3M88G5SfYxDWtuh0MqcMfrHHoNRA,2178
@@ -22,10 +22,10 @@ kubernator/plugins/minikube.py,sha256=zbboER1VsCvIsh-yUE3_XpzPNcT4c6vh1LigDonEm3
 kubernator/plugins/template.py,sha256=542nyS4ZNgdwJHEoIA5aLP1d4C312ydd7sPM9ZFbHuI,8357
 kubernator/plugins/terraform.py,sha256=a1MPl9G8Rznjd28uMRdYWrjpFDLlFAVmLFH4hFEsMsQ,5285
 kubernator/plugins/terragrunt.py,sha256=-qN8tTqPUXJ9O7CEiJVUB0GSUQU3DUTkv-aWdIIsm7Q,5051
-kubernator-1.0.23.dev20251008231728.dist-info/METADATA,sha256=0yPWkwLaU5qE8qcUzX-Rzw5tL_qprEbUVzv8hm44Gh4,10840
-kubernator-1.0.23.dev20251008231728.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kubernator-1.0.23.dev20251008231728.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
-kubernator-1.0.23.dev20251008231728.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.23.dev20251008231728.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
-kubernator-1.0.23.dev20251008231728.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.23.dev20251008231728.dist-info/RECORD,,
+kubernator-1.0.23.dev20251010010455.dist-info/METADATA,sha256=XN7fMdues-A_taikGGhY-goi9SIng_5XrqyFscMzP5g,10840
+kubernator-1.0.23.dev20251010010455.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kubernator-1.0.23.dev20251010010455.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
+kubernator-1.0.23.dev20251010010455.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+kubernator-1.0.23.dev20251010010455.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
+kubernator-1.0.23.dev20251010010455.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+kubernator-1.0.23.dev20251010010455.dist-info/RECORD,,