nyl 0.10.2__tar.gz → 0.10.3__tar.gz

nyl-0.10.3/.changelog/0.10.3.toml

@@ -0,0 +1,13 @@
+release-date = "2025-05-08"
+
+[[entries]]
+id = "67d4932f-0e84-4299-90ae-333cf7774ee0"
+type = "improvement"
+description = "Further improve filtering of env vars that start with ARGOCD_ but are Kubernetes-specific"
+author = "@NiklasRosenstein"
+
+[[entries]]
+id = "5b794574-bca0-4160-b2ff-3f5d68e296a9"
+type = "improvement"
+description = "Automatically drop empty `.metadata.labels` fields from resources generated with `nyl template` to prevent resources with such labels to immediately be `OutOfSync` after apply in ArgoCD"
+author = "@NiklasRosenstein"

{nyl-0.10.2 → nyl-0.10.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nyl
-Version: 0.10.2
+Version: 0.10.3
 Summary: Advanced templating engine for Kubernetes and GitOps.
 Author-email: Niklas Rosenstein <rosensteinniklas@gmail.com>
 License: MIT

{nyl-0.10.2 → nyl-0.10.3}/docs/content/changelog.md

@@ -1,3 +1,14 @@
+## 0.10.3 (2025-05-08)
+
+<table><tr><th>Type</th><th>Description</th><th>PR</th><th>Issues</th><th>Author</th></tr>
+  <tr><td>Improvement</td><td>
+
+Further improve filtering of env vars that start with ARGOCD_ but are Kubernetes-specific</td><td></td><td></td><td>@NiklasRosenstein</td></tr>
+  <tr><td>Improvement</td><td>
+
+Automatically drop empty `.metadata.labels` fields from resources generated with `nyl template` to prevent resources with such labels to immediately be `OutOfSync` after apply in ArgoCD</td><td></td><td></td><td>@NiklasRosenstein</td></tr>
+</table>
+
 ## 0.10.2 (2025-05-08)
 
 <table><tr><th>Type</th><th>Description</th><th>PR</th><th>Issues</th><th>Author</th></tr>

{nyl-0.10.2 → nyl-0.10.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nyl"
-version = "0.10.2"
+version = "0.10.3"
 description = "Advanced templating engine for Kubernetes and GitOps."
 authors = [
     {name = "Niklas Rosenstein", email = "rosensteinniklas@gmail.com"},

{nyl-0.10.2 → nyl-0.10.3}/src/nyl/commands/__init__.py

@@ -88,7 +88,10 @@ def _callback(
     for key, value in os.environ.items():
         if (
             # Keep ARGOCD_ environment variables but filter out those that are likely set by Kubernetes.
-            (key.startswith("ARGOCD_") and not (key.endswith("_PORT") or key.endswith("_TCP") or key.endswith("_ADDR")))
+            (
+                key.startswith("ARGOCD_")
+                and not any(x in key for x in ["_PORT", "_PROTO", "_SERVER", "_HOST", "_SERVICE", "_TCP", "_UDP"])
+            )
             or key.startswith("NYL_")
             or key.startswith("KUBE_")
         ):

{nyl-0.10.2 → nyl-0.10.3}/src/nyl/commands/template.py

@@ -27,7 +27,7 @@ from nyl.secrets.config import SecretsConfig
 from nyl.templating import NylTemplateEngine
 from nyl.tools import yaml
 from nyl.tools.kubectl import Kubectl
-from nyl.tools.kubernetes import populate_namespace_to_resources
+from nyl.tools.kubernetes import drop_empty_metadata_labels, populate_namespace_to_resources
 from nyl.tools.logging import lazy_str
 from nyl.tools.types import Resource, ResourceList
 
@@ -365,6 +365,7 @@ def template(
                     labels[APPLYSET_LABEL_PART_OF] = applyset.id
 
         populate_namespace_to_resources(source.resources, current_default_namespace)
+        drop_empty_metadata_labels(source.resources)
 
         # Now apply the post-processor.
         source.resources = PostProcessor.apply_all(source.resources, post_processors, source.file)

{nyl-0.10.2 → nyl-0.10.3}/src/nyl/tools/kubernetes.py

@@ -51,6 +51,20 @@ def populate_namespace_to_resources(resources: list[Resource], namespace: str) -
             resource["metadata"]["namespace"] = namespace
 
 
+def drop_empty_metadata_labels(resources: list[Resource]) -> None:
+    """
+    Drop the `metadata.labels` field from all resources that have it but are empty.
+
+    This gets applied to resources after templating as it can cause the resources to be OutOfSync immediately
+    after apply as the Kubernetes API stores the empty labels as `null` instead of `{}`.
+    """
+
+    for resource in resources:
+        if "metadata" in resource and "labels" in resource["metadata"]:
+            if not resource["metadata"]["labels"]:
+                del resource["metadata"]["labels"]
+
+
 def is_cluster_scoped_resource(manifest: Resource) -> bool:
     """
     Check if a manifest is a cluster scoped resource.

{nyl-0.10.2 → nyl-0.10.3}/uv.lock

@@ -429,7 +429,7 @@ wheels = [
 
 [[package]]
 name = "nyl"
-version = "0.10.2"
+version = "0.10.3"
 source = { editable = "." }
 dependencies = [
     { name = "bcrypt" },