nyl 0.10.2__tar.gz → 0.10.4__tar.gz

nyl-0.10.4/.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.4}/.github/workflows/docs.yaml

@@ -2,19 +2,21 @@ name: Documentation
 
 on:
   push:
-    branches: [ develop ]
-    tags: [ '*' ]
-  pull_request:
-    branches: [ develop ]
+    branches: [develop]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     permissions:
-      contents: write
-
+      contents: read
+      pages: write
+      id-token: write
+    environment:
+      name: github-pages
+      url: ${{steps.deployment.outputs.page_url}}
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/configure-pages@v5
       - name: Check Nix flake Nixpkgs inputs
         uses: DeterminateSystems/flake-checker-action@main
       - uses: cachix/install-nix-action@v31
@@ -24,15 +26,15 @@ jobs:
         with:
           name: mycache
           # If you chose signing key for write access
-          signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
+          signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
           # If you chose API tokens for write access OR if you have a private cache
-          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
       - name: Build docs
         run: nix run .#docs build
-
-      - name: Publish documentation
-        uses: peaceiris/actions-gh-pages@v4
+      - name: Upload Artifact
+        uses: actions/upload-pages-artifact@v3
         with:
-          personal_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./docs/site
+          path: ./docs/site
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

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

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

{nyl-0.10.2 → nyl-0.10.4}/argocd-cmp/Dockerfile

@@ -1,5 +1,5 @@
 FROM python:3.13-slim AS build_base
-COPY --from=ghcr.io/astral-sh/uv:0.7.2 /uv /bin/uv
+COPY --from=ghcr.io/astral-sh/uv:0.7.12 /uv /bin/uv
 
 #: Build Nyl itself.
 #: -----------------
@@ -41,7 +41,7 @@ RUN \
 FROM fetch-bin-base AS argocd-bin
 # Find ArgoCD releases at https://github.com/argoproj/argo-cd/releases
 # renovate: datasource=github-releases depName=argocd packageName=argoproj/argo-cd
-ARG ARGOCD_VERSION=v2.14.11
+ARG ARGOCD_VERSION=v2.14.14
 RUN curl -sSfLo /usr/local/bin/argocd https://github.com/argoproj/argo-cd/releases/download/${ARGOCD_VERSION}/argocd-linux-$(cat /BINARY_ARCH) \
     && chmod +x /usr/local/bin/argocd \
     && upx /usr/local/bin/argocd \
@@ -50,7 +50,7 @@ RUN curl -sSfLo /usr/local/bin/argocd https://github.com/argoproj/argo-cd/releas
 FROM fetch-bin-base AS helm-bin
 # Find Helm releases at https://github.com/helm/helm/releases
 # renovate: datasource=github-releases depName=helm packageName=helm/helm
-ARG HELM_VERSION=v3.17.3
+ARG HELM_VERSION=v3.18.2
 RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 \
     && chmod 700 get_helm.sh \
     && ./get_helm.sh --version $HELM_VERSION \
@@ -69,7 +69,7 @@ RUN curl -fLO https://github.com/getsops/sops/releases/download/${SOPS_VERSION}/
 
 FROM fetch-bin-base AS kyverno-bin
 # renovate: datasource=github-releases depName=kyverno packageName=kyverno/kyverno
-ARG KYVERNO_VERSION=1.14.1
+ARG KYVERNO_VERSION=1.14.2
 RUN \
     case "$(uname -m)" in \
         x86_64) KYVERNO_ARCH='x86_64' ;; \

{nyl-0.10.2 → nyl-0.10.4}/argocd-cmp/plugin.yaml

@@ -16,7 +16,7 @@ spec:
         - -c
         - |
           cd $(git rev-parse --show-toplevel)
-          find -name 'nyl-secrets.*' || find -name 'nyl-project.*'
+          (find . -name 'nyl-secrets.*' | grep .) || (find . -name 'nyl-project.*' | grep .)
 
   # init:
   #   command:

{nyl-0.10.2 → nyl-0.10.4}/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>
@@ -192,6 +203,6 @@ Refactor `PostProcessor` implementation for generating policy files and invoking
 `PostProcessor` log for invoking Kyverno now lists the policy file paths that are going to be applied</td><td></td><td></td><td>@NiklasRosenstein</td></tr>
   <tr><td>Fix</td><td>
 
-`nyl new chart` now generates 2-space indented YAML and has a more complete template</td><td></td><td><a href="https://github.com/NiklasRosenstein/nyl/issues/47">47</a></td><td>@NiklasRosenstein</td></tr>
+`nyl new chart` now generates 2-space indented YAML and has a more complete template</td><td></td><td><a href="https://github.com/NiklasRosenstein/nyl/issues/47">NiklasRosenstein/nyl#47</a></td><td>@NiklasRosenstein</td></tr>
 </table>
 

{nyl-0.10.2 → nyl-0.10.4}/docs/content/reference/argocd-plugin.md

@@ -53,6 +53,10 @@ repoServer:
 
 ## Installation (Daemon)
 
+!!! warning
+
+    The daemon mode is currently in an experimental state and not recommended for production use.
+
 The above example will invoke the `nyl template` command again and again for each time an application's manifests are
 refreshed by ArgoCD. This carries a bit of a performance penalty, since a new Nyl process is spawned each time and
 loading its code from disk.

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

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

{nyl-0.10.2 → nyl-0.10.4}/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.4}/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.4}/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.