nyl 0.9.0__tar.gz → 0.9.2__tar.gz

nyl-0.9.2/.changelog/0.9.0.toml

@@ -0,0 +1,31 @@
+release-date = "2025-04-15"
+
+[[entries]]
+id = "a2772016-3dff-4da6-926d-1f47e509c63a"
+type = "feature"
+description = "Add ability to define and use local variables in manifests"
+author = "@NiklasRosenstein"
+
+[[entries]]
+id = "11f1c1eb-5442-46c9-bf00-9f383c58cc47"
+type = "improvement"
+description = "argocd-cmp: Upgrade ArgoCD from v2.13.1 to v2.14.10"
+author = "@NiklasRosenstein"
+
+[[entries]]
+id = "a275e0d6-3dc3-44ac-a737-5d369bd8e412"
+type = "improvement"
+description = "argocd-cmp: Upgrade Helm from v3.16.3 to v3.17.3"
+author = "@NiklasRosenstein"
+
+[[entries]]
+id = "05430d18-8d65-460a-9230-299a48d3bb1f"
+type = "improvement"
+description = "argocd-cmp: Upgrade Sops from v3.9.2 to v3.10.2"
+author = "@NiklasRosenstein"
+
+[[entries]]
+id = "c1984d5a-9e9f-480f-b6f9-cfb2b6f8d0ff"
+type = "improvement"
+description = "argocd-cmp: Upgrade Kyverno from 1.13.2 to 1.13.4"
+author = "@NiklasRosenstein"

nyl-0.9.2/.changelog/0.9.1.toml

@@ -0,0 +1,25 @@
+release-date = "2025-04-20"
+
+[[entries]]
+id = "ee341cce-af19-447c-88af-a62248924ab6"
+type = "improvement"
+description = "`nyl new component` now includes `metadata.labels` and `metadata.annotations` defaults in the generated `values.yaml`"
+author = "@NiklasRosenstein"
+
+[[entries]]
+id = "3dc4e6b4-4a6d-4ed3-8e8b-5e9321cabb9a"
+type = "feature"
+description = "Add support for `NYL_ARGS` and `ARGOCD_ENV_NYL_ARGS` environment variables"
+author = "@NiklasRosenstein"
+
+[[entries]]
+id = "71dada10-a681-47d6-8399-5769a8ecf455"
+type = "improvement"
+description = "Improve help text of `nyl new component` command"
+author = "@NiklasRosenstein"
+
+[[entries]]
+id = "3dc3cd0e-ad32-465b-b67c-0f18c8cb1b3e"
+type = "improvement"
+description = "`.metadata.labels` set on a `HelmChart` resource now propagate and overwrite labels on the resources it generates (note that this also applies to Nyl components using Helm charts)"
+author = "@NiklasRosenstein"

nyl-0.9.2/.changelog/0.9.2.toml

@@ -0,0 +1,13 @@
+release-date = "2025-04-22"
+
+[[entries]]
+id = "469033a3-ec4d-4a54-9294-b1608735bacb"
+type = "improvement"
+description = "Introduce new `values` object into templating evaluation namespace, replacing the `locals` object going forward. The `locals` name is still available but will be removed in an upcoming release."
+author = "@NiklasRosenstein"
+
+[[entries]]
+id = "7cd10ee2-9c5a-4c23-8fe4-9f4d9291ceb4"
+type = "feature"
+description = "Allow defining parameters in the \"values\" of a profile, accessible via `${{ values.PARAM }}` throughout manifest rendering with the profile."
+author = "@NiklasRosenstein"

nyl-0.9.2/DEPRECATION_NOTICE.md

@@ -0,0 +1,7 @@
+The following is a list of features and functionalities that are deprecated and will be removed in a future version
+of Nyl. This file serves as an announcement as well as reminder before cutting a new release.
+
+## Deprecated Features
+
+* `locals` in templates: The use of `locals` in templates is deprecated and will be removed in Nyl 0.10.x. Please
+  use `values` instead.

{nyl-0.9.0 → nyl-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nyl
-Version: 0.9.0
+Version: 0.9.2
 Summary: Advanced templating engine for Kubernetes and GitOps.
 Author-email: Niklas Rosenstein <rosensteinniklas@gmail.com>
 License: MIT
@@ -33,7 +33,7 @@ Requires Python 3.11 or newer.
 
 For some features, additional programs must be available:
 
-* [kubectl](https://kubernetes.io/de/docs/reference/kubectl/) for most operations
+* [kubectl](https://kubernetes.io/de/docs/reference/kubectl/) for applying
 * [kyverno](https://kyverno.io/docs/kyverno-cli/) ^1.13.x when using the Nyl `PostProcessor` resource
 * [sops](https://github.com/getsops/sops) when using the SOPS secrets provider
 

{nyl-0.9.0 → nyl-0.9.2}/README.md

@@ -11,7 +11,7 @@ Requires Python 3.11 or newer.
 
 For some features, additional programs must be available:
 
-* [kubectl](https://kubernetes.io/de/docs/reference/kubectl/) for most operations
+* [kubectl](https://kubernetes.io/de/docs/reference/kubectl/) for applying
 * [kyverno](https://kyverno.io/docs/kyverno-cli/) ^1.13.x when using the Nyl `PostProcessor` resource
 * [sops](https://github.com/getsops/sops) when using the SOPS secrets provider
 

{nyl-0.9.0 → nyl-0.9.2}/docs/content/changelog.md

@@ -1,4 +1,66 @@
-# Changelog
+## 0.9.2 (2025-04-22)
+
+<table><tr><th>Type</th><th>Description</th><th>PR</th><th>Issues</th><th>Author</th></tr>
+  <tr><td>Improvement</td><td>
+
+Introduce new `values` object into templating evaluation namespace, replacing the `locals` object going forward. The `locals` name is still available but will be removed in an upcoming release.</td><td></td><td></td><td>@NiklasRosenstein</td></tr>
+  <tr><td>Feature</td><td>
+
+Allow defining parameters in the "values" of a profile, accessible via `${{ values.PARAM }}` throughout manifest rendering with the profile.</td><td></td><td></td><td>@NiklasRosenstein</td></tr>
+</table>
+
+## 0.9.1 (2025-04-20)
+
+<table><tr><th>Type</th><th>Description</th><th>PR</th><th>Issues</th><th>Author</th></tr>
+  <tr><td>Improvement</td><td>
+
+`nyl new component` now includes `metadata.labels` and `metadata.annotations` defaults in the generated `values.yaml`</td><td></td><td></td><td>@NiklasRosenstein</td></tr>
+  <tr><td>Feature</td><td>
+
+Add support for `NYL_ARGS` and `ARGOCD_ENV_NYL_ARGS` environment variables</td><td></td><td></td><td>@NiklasRosenstein</td></tr>
+  <tr><td>Improvement</td><td>
+
+Improve help text of `nyl new component` command</td><td></td><td></td><td>@NiklasRosenstein</td></tr>
+  <tr><td>Improvement</td><td>
+
+`.metadata.labels` set on a `HelmChart` resource now propagate and overwrite labels on the resources it generates (note that this also applies to Nyl components using Helm charts)</td><td></td><td></td><td>@NiklasRosenstein</td></tr>
+</table>
+
+## 0.9.0 (2025-04-15)
+
+<table><tr><th>Type</th><th>Description</th><th>PR</th><th>Issues</th><th>Author</th></tr>
+  <tr><td>Feature</td><td>
+
+Add ability to define and use local variables in manifests</td><td></td><td></td><td>@NiklasRosenstein</td></tr>
+  <tr><td>Improvement</td><td>
+
+argocd-cmp: Upgrade ArgoCD from v2.13.1 to v2.14.10</td><td></td><td></td><td>@NiklasRosenstein</td></tr>
+  <tr><td>Improvement</td><td>
+
+argocd-cmp: Upgrade Helm from v3.16.3 to v3.17.3</td><td></td><td></td><td>@NiklasRosenstein</td></tr>
+  <tr><td>Improvement</td><td>
+
+argocd-cmp: Upgrade Sops from v3.9.2 to v3.10.2</td><td></td><td></td><td>@NiklasRosenstein</td></tr>
+  <tr><td>Improvement</td><td>
+
+argocd-cmp: Upgrade Kyverno from 1.13.2 to 1.13.4</td><td></td><td></td><td>@NiklasRosenstein</td></tr>
+</table>
+
+## 0.8.1 (2025-01-22)
+
+<table><tr><th>Type</th><th>Description</th><th>PR</th><th>Issues</th><th>Author</th></tr>
+  <tr><td>Fix</td><td>
+
+Remove sneaky `breakpoint()` call in `nyl template`</td><td></td><td></td><td>@NiklasRosenstein</td></tr>
+</table>
+
+## 0.8.0 (2025-01-22)
+
+<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 on #56 by populating the namespace of resources earlier than later (e.g. before the `HelmChart` gets rendered, instead of only applying it to the resources generated by the `HelmChart` at the end).</td><td></td><td></td><td>@NiklasRosenstein</td></tr>
+</table>
 
 ## 0.7.2 (2025-01-17)
 
@@ -63,35 +125,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>
 
-## 0.6.0
-
-* Upgraded `argocd-cmp-server` in `nyl/argocd-cmp` container image to `v2.13.1` (see [#46](https://github.com/helsing-ai/nyl/pull/46))
-* Re-introduce `settings.generate_placeholders` in `nyl-project.toml`, but warn if it is used. Enabling the option will have the
-    same effect as setting `on_lookup_failure = "CreatePlaceholder"` and take precedence over the original value of `on_lookup_failure`.
-
-## 0.5.1
-
-* Add Nix flake
-* Docs: Add missing API docs for `nyl.secrets.kubernetes`
-
-## 0.5.0
-
-* Add the [`KubernetesSecret`](./reference/configuration/secrets.md#provider-kubernetessecret) secret provider
-* Add the `ntyl secrets set` and `nyl secrets unset` commands
-* Breaking: Replace the `settings.generate_placeholders` option with `settings.on_lookup_failure`
-
-## 0.4.0
-
-* Automatically replace the host in Kubeconfig `server` field if it is set to `localhost`, `0.0.0.0` or `127.0.0.1`
-    when a Kubeconfig is retrieved via SSH (saving you to configure `replace_apiserver_hostname` when sourcing a
-    Kubeconfig from a K3s/RKE2 cluster via SSH).
-* Add `port` and `sudo` option to `KubeconfigFromSsh` config
-
-## 0.3.0
-
-* Add [`PostProcessor`](./reference/templating/inlining/postprocessor.md) inline resource which supports applying
-    Kyverno policies to the generated resources.
-* Fixed a bug in the construction of the local Helm chart path when referencing a Helm chart in a Git repository.

nyl-0.9.2/docs/content/index.md

@@ -0,0 +1,22 @@
+---
+title: Home
+---
+
+# Welcome to the Nyl documentation
+
+Nyl is a flexible configuration management tool for Kubernetes resources that can be used to generate and deploy
+applications directly via the command-line and via an [ArgoCD ConfigManagementPlugin][CMP].
+
+  [CMP]: https://argoproj.github.io/argo-cd/operator-manual/config-management-plugins/
+
+## Features
+
+- **Usability**: Define your deployments once and let ArgoCD apply them, or apply the same deployment from the CLI when you
+  need to break the glass without having to twist and warp your configuration for the occasion.
+
+- **End-to-end configuration**: Not only codify your deployment configuration, but also how to connect to your cluster
+  when you use the CLI. From using the default kubeconfig, to connecting to your cluster via an SSH tunnel, Nyl got you.
+
+- **Powerful templating**: Load and inject secrets from external sources, instantiate Helm charts, post-process your
+  manifests with Kyverno policies, streamline and standardize recurring configuration with Nyl components, lookup
+  existing objects in the target cluster, etc.

{nyl-0.9.0 → nyl-0.9.2}/docs/content/reference/configuration/environment.md

@@ -2,6 +2,11 @@
 
 This page summarizes all environment variables that are used by Nyl.
 
+## General
+
+- `NYL_ARGS` – Additional command-line arguments to append to the Nyl invocation. Use with care, as options
+  accepted by a parent command are not accepted in a subcommand, and these arguments are only ever append to the
+  argument list.
 - `NYL_LOG_LEVEL` – The log level to use if `--log-level` is not specified. Defaults to `info`. Used by: `nyl`.
 - `NYL_PROFILE` – The name of the profile to use as defined in the closest `nyl-profiles.yaml` or
   `nyl-project.yaml` configuration file. Used by: `nyl profile`, `nyl template`, `nyl tun`.
@@ -12,10 +17,11 @@ This page summarizes all environment variables that are used by Nyl.
   Used by: `nyl profile`, `nyl template`, `nyl tun`.
 - `NYL_CACHE_DIR` – The directory where Nyl stores its cache, such as downloaded Helm charts and cloned
   repositories. Defaults to `cache/` relative to the `NYL_STATE_DIR`. Used by `nyl template`.
-- `ARGOCD_ENV_NYL_CMP_TEMPLATE_INPUT` — This variable is only recognized by `nyl template` when the only positional argument
-  it receives is `.` (i.e. the current working directory). The variable should be a comma-separated list of filenames
-  that should be treated as if the files were passed as arguments to `nyl template` instead. This is used for the Nyl
-  ArgoCD plugin to allow specifying exactly which files should be templated as part of an ArgoCD application.
+
+## Build-environment variables
+
+> The following variables are supported for they are provided by [ArgoCD as Build Environment Variables][^ArgoBuildEnv].
+
 - `KUBE_VERSION` – The version of the Kubernetes cluster. If this is not set, Nyl will try to query the Kubernetes
   API server to determine the version. When used as an ArgoCD plugin, this variable is usually available
   [^ArgoBuildEnv]. Used by: `nyl template`.
@@ -23,4 +29,15 @@ This page summarizes all environment variables that are used by Nyl.
   Nyl will try to query the Kubernetes API server to determine the versions. When used as an ArgoCD plugin, this
   variable is usually available [^ArgoBuildEnv]. Used by: `nyl template`.
 
+## Plugin variables
+
+> ArgoCD permits passing environment variables to CustomManagementPlugins. These get prefixed with `ARGOCD_ENV` to
+> ensure that only specifically supported variables can be set. The following such variables are supported by Nyl:
+
+- `ARGOCD_ENV_NYL_ARGS` – Same as `NYL_ARGS`, but is taken into account after.
+- `ARGOCD_ENV_NYL_CMP_TEMPLATE_INPUT` — This variable is only recognized by `nyl template` when the only positional argument
+  it receives is `.` (i.e. the current working directory). The variable should be a comma-separated list of filenames
+  that should be treated as if the files were passed as arguments to `nyl template` instead. This is used for the Nyl
+  ArgoCD plugin to allow specifying exactly which files should be templated as part of an ArgoCD application.
+
 [^ArgoBuildEnv]: See [ArgoCD Build Environment](https://argo-cd.readthedocs.io/en/stable/user-guide/build-environment/).

{nyl-0.9.0 → nyl-0.9.2}/docs/content/reference/templating/basics.md

@@ -17,5 +17,6 @@ Currently, only the following names are available in the scope of the expression
 
 - `secrets`: A reference to the secrets provider. This is used to retrieve secrets from the configured secrets
   provider. See [Secrets](./secrets.md) for more information.
-- `locals`: A container for local variables defined in the same manifest. See [Local Variables](./locals.md) for more
-  information.
+- `values`: A container for values defined on the profile-level (see [Profiles](../configuration/profiles.md)) or in the
+  manifest (see [Local Variables](./locals.md)). (Note that the use of `locals` instead of `values` is deprecated and
+  will be removed in Nyl 0.10.x).

{nyl-0.9.0 → nyl-0.9.2}/docs/content/reference/templating/locals.md

@@ -2,10 +2,10 @@
 
 You may define a YAML object in your Kubernetes manifest that is used to define variables that can later be accessed
 in the same manifest to achieve some level of DRY-ness. This is done by not setting any `apiVersion` or `kind`, and
-instead just define variables prefixed with `$`. Variables can later be accessed using the `${{ locals.var }}`.
+instead just define variables prefixed with `$`. Variables can later be accessed using the `${{ values.var }}`.
 
 Note that expressions in values assigned to variables are not currently supported. This means that you cannot use e.g.
-`${{ secrets.get("my-secret") }}` in the value of a variable, nor can you use `${{ locals.var }}`.
+`${{ secrets.get("my-secret") }}` in the value of a variable, nor can you use `${{ values.var }}`.
 
 ## Example
 
@@ -17,7 +17,7 @@ $name: my-app
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: ${{ locals.name }}
+  name: ${{ values.name }}
 # ...
 ```
 

{nyl-0.9.0 → nyl-0.9.2}/example/manifests/postgres.yaml

@@ -3,7 +3,8 @@ kind: StatefulSecret
 metadata:
   name: postgres-password
 stringData:
-  PASSWORD: {{ randhex(32) }}
+  PASSWORD: ${{ randhex(32) }}
+
 ---
 apiVersion: nyl.io/v1
 kind: HelmChart
@@ -16,4 +17,4 @@ spec:
     version: 15.5.16
   values:
     auth:
-      postgresPassword: {{ ref("Secret", "postgres-password", "PASSWORD") }}
+      postgresPassword: ${{ ref("Secret", "postgres-password", "PASSWORD") }}

nyl-0.9.2/example/nyl-profiles.toml

@@ -0,0 +1,10 @@
+[default.kubeconfig]
+type = "ssh"
+user = "root"
+host = "k3s.host.local"
+path = "/etc/rancher/k3s/k3s.yaml"
+
+[default.tunnel]
+type = "ssh"
+user = "root"
+host = "k3s.host.local"

{nyl-0.9.0 → nyl-0.9.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nyl"
-version = "0.9.0"
+version = "0.9.2"
 description = "Advanced templating engine for Kubernetes and GitOps."
 authors = [
     {name = "Niklas Rosenstein", email = "rosensteinniklas@gmail.com"},
@@ -29,7 +29,7 @@ readme = "README.md"
 license = {text = "MIT"}
 
 [project.scripts]
-nyl = "nyl.commands:app"
+nyl = "nyl.commands:main"
 
 [tool.uv]
 dev-dependencies = [

nyl-0.9.2/slap.toml

@@ -0,0 +1,2 @@
+[release]
+pre-commit = "slap changelog format --all --markdown > docs/content/changelog.md && git add docs/content/changelog.md"

{nyl-0.9.0 → nyl-0.9.2}/src/nyl/commands/__init__.py

@@ -6,6 +6,7 @@ applications directly or integrate as an ArgoCD ConfigManagementPlugin.
 import atexit
 import json
 import os
+import shlex
 import sys
 import time
 from dataclasses import dataclass
@@ -19,6 +20,7 @@ from typer import Option, Typer
 from kubernetes.client.api_client import ApiClient
 from nyl import __version__
 from nyl.profiles import ProfileManager
+from nyl.profiles.config import Profile
 from nyl.project.config import ProjectConfig
 from nyl.secrets.config import SecretsConfig
 from nyl.tools.di import DependenciesProvider
@@ -109,6 +111,12 @@ def _callback(
             PROVIDER.get(ProfileManager), PROVIDER.get(ApiClientConfig).profile
         ),
     )
+    PROVIDER.set_lazy(
+        Profile,
+        lambda: PROVIDER.get(ProfileManager).config.profiles[
+            PROVIDER.get(ApiClientConfig).profile or template.DEFAULT_PROFILE
+        ],
+    )
 
 
 @app.command()
@@ -139,3 +147,16 @@ app.add_typer(profile.app)
 app.add_typer(secrets.app)
 app.add_typer(tools.app)
 app.add_typer(tun.app)
+
+
+def main() -> None:
+    additional_args = []
+    for env in ("NYL_ARGS", "ARGOCD_ENV_NYL_ARGS"):
+        if env in os.environ:
+            additional_args = shlex.split(args_string := os.environ[env])
+            logger.opt(colors=True).debug(
+                "Adding additional arguments from <cyan>{}</>: <yellow>{}</>", env, args_string
+            )
+    sys.argv += additional_args
+    logger.opt(colors=True).debug("Full Nyl command-line: <yellow>{}</>", shlex.join(sys.argv))
+    app()

{nyl-0.9.0 → nyl-0.9.2}/src/nyl/commands/new.py

@@ -7,7 +7,7 @@ from pathlib import Path
 from textwrap import dedent
 
 from loguru import logger
-from typer import Option, Typer
+from typer import Argument, Option, Typer
 
 from nyl.commands import PROVIDER
 from nyl.project.config import ProjectConfig
@@ -52,6 +52,9 @@ def chart(dir: Path) -> None:
         dir,
         "values.yaml",
         """
+        metadata:
+          annotations: {}
+          labels: {}
         image:
           repository: my/image
           tag: 1.0.0
@@ -71,6 +74,10 @@ def chart(dir: Path) -> None:
                 "image"
             ],
             "properties": {
+                "metadata": {
+                    "type": "object",
+                    "additionalProperties": true
+                },
                 "image": {
                     "type": "string"
                 }
@@ -111,11 +118,17 @@ def chart(dir: Path) -> None:
 
 @app.command()
 def component(
-    api_version: str,
-    kind: str,
+    api_version: str = Argument(help="API version of the component. Must be paired with the `kind` argument."),
+    kind: str = Argument(help="Kind of the component. Must be paired with the `api_version` argument."),
     type: ComponentType = Option("helm", help="The type of Nyl component to create."),
 ) -> None:
-    """Create the boilerplate for a Nyl component in the components directory."""
+    """
+    Create the boilerplate for a Nyl component in the components directory.
+
+    Note that this is equivalent to `nyl new chart components/{api_version}/{kind}`, assuming the current project's
+    component directory is `components/` (the default, relative to the project configuration file or current working
+    directory).
+    """
 
     components_path = PROVIDER.get(ProjectConfig).get_components_path()
     chart(components_path / api_version / kind)

{nyl-0.9.0 → nyl-0.9.2}/src/nyl/commands/template.py

@@ -16,6 +16,7 @@ from nyl.commands import PROVIDER, ApiClientConfig, app
 from nyl.generator import reconcile_generator
 from nyl.generator.dispatch import DispatchingGenerator
 from nyl.profiles import ProfileManager
+from nyl.profiles.config import Profile
 from nyl.project.config import ProjectConfig
 from nyl.resources import API_VERSION_INLINE, NylResource
 from nyl.resources.applyset import APPLYSET_LABEL_PART_OF, ApplySet
@@ -64,7 +65,7 @@ def get_profile_kubernetes_client(profiles: ProfileManager, profile: str | None)
 
     If no *profile* is specified, but the profile manager contains at least one profile, the *profile* argument will
     default to the value of :data:`DEFAULT_PROFILE` (which is `"default"`). Otherwise, if no profile is selected and
-    none is configured, the standard Kubernetes config load takes place (i.e. try `KUBECONFIG` and then
+    none is configured, the standard Kubernetes config loading is used (i.e. try `KUBECONFIG` and then
     `~/.kube/config`).
     """
 
@@ -210,6 +211,9 @@ def template(
             else project.config.settings.on_lookup_failure,
         )
 
+        # Seed the template engine with the profile values.
+        vars(template_engine.values).update(PROVIDER.get(Profile).values)
+
         # Look for objects that contain local variables and feed them into the template engine.
         for manifest in source.manifests[:]:
             if "apiVersion" in manifest or "kind" in manifest:
@@ -227,7 +231,7 @@ def template(
                 exit(1)
             for key, value in manifest.items():
                 assert key.startswith("$"), key
-                setattr(template_engine.locals, key[1:], value)
+                setattr(template_engine.values, key[1:], value)
             source.manifests.remove(manifest)
 
         # Begin populating the default namespace to resources.

{nyl-0.9.0 → nyl-0.9.2}/src/nyl/generator/helmchart.py

@@ -215,4 +215,7 @@ class HelmChartGenerator(Generator[HelmChart], resource_type=HelmChart):
             if release.namespace:
                 populate_namespace_to_resources(manifests, release.namespace)
 
+            for resource in manifests:
+                resource["metadata"].setdefault("labels", {}).update(res.metadata.labels or {})
+
             return manifests

nyl-0.9.2/src/nyl/generator/helmchart_test.py

@@ -0,0 +1,44 @@
+from pathlib import Path
+from tempfile import TemporaryDirectory
+from typing import Iterator
+
+import pytest
+from nyl.generator.helmchart import HelmChartGenerator
+from nyl.resources import ObjectMetadata
+from nyl.resources.helmchart import ChartRef, HelmChart, HelmChartSpec
+from nyl.tools.testing import TESTDATA_PATH
+
+CHART_PATH = TESTDATA_PATH / "helm-test-chart"
+
+
+@pytest.fixture
+def generator() -> Iterator[HelmChartGenerator]:
+    with TemporaryDirectory() as _tmp:
+        tmp = Path(_tmp)
+        yield HelmChartGenerator(tmp, tmp, [], tmp, "1.31", set())
+
+
+def test_helmchart_resource_overrides_labels(generator: HelmChartGenerator) -> None:
+    """
+    This test verifies that resources generated by a Helm chart component have their labels updated and overwritten
+    by labels on the resource that describes the chart instantiation.
+    """
+
+    chart_resource = HelmChart(
+        metadata=ObjectMetadata(
+            name="myapp",
+            namespace="mynamespace",
+            labels={"app.kubernetes.io/name": "overwritten-value", "team": "testing"},
+        ),
+        spec=HelmChartSpec(chart=ChartRef(path=str(CHART_PATH))),
+    )
+
+    resources = generator.generate(chart_resource)
+    assert len(resources) == 1
+    assert resources[0]["apiVersion"] == "v1"
+    assert resources[0]["kind"] == "ServiceAccount"
+    assert resources[0]["metadata"]["labels"] == {
+        "app.kubernetes.io/name": "overwritten-value",
+        "app.kubernetes.io/version": "1.0.0",
+        "team": "testing",
+    }

{nyl-0.9.0 → nyl-0.9.2}/src/nyl/profiles/config.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import Literal
+from typing import Any, Literal
 
 from loguru import logger
 
@@ -13,7 +13,14 @@ from nyl.tools.loads import loadf
 @dataclass
 class Profile:
     """
-    Represents a Kubernetes connection profile.
+    A profile embodies a set of configurations for a Kubernetes cluster that resources will be deployed to using Nyl.
+    It defines the Kubeconfig to use, whether to use an SSH tunnel to reach the cluster, as well as global values that
+    are accessible during rendering any manifest with the profile activated.
+    """
+
+    values: dict[str, Any] = field(default_factory=dict)
+    """
+    Global values that are accessible during manifest rendering under the `values` object.
     """
 
     kubeconfig: LocalKubeconfig | KubeconfigFromSsh = field(default_factory=lambda: LocalKubeconfig())

{nyl-0.9.0 → nyl-0.9.2}/src/nyl/templating.py

@@ -173,7 +173,7 @@ class NylTemplateEngine:
 
     secrets: SecretProvider
     client: ApiClient
-    locals: Namespace = field(default_factory=Namespace)
+    values: Namespace = field(default_factory=Namespace)
     on_lookup_failure: Literal["Error", "CreatePlaceholder", "SkipResource"] = "Error"
 
     def __post_init__(self) -> None:
@@ -196,7 +196,14 @@ class NylTemplateEngine:
                 NylTemplateEngine.current = prev
 
     def _new_engine(self) -> _TemplateEngine:
-        return _TemplateEngine({"secrets": self.secrets, "locals": self.locals, **registered_functions})
+        return _TemplateEngine(
+            {
+                "secrets": self.secrets,
+                "locals": self.values,  # TODO: Deprecate in 0.10.x
+                "values": self.values,
+                **registered_functions,
+            }
+        )
 
     def evaluate(self, value: Manifests, recursive: bool = True) -> Manifests:
         result = []

{nyl-0.9.0 → nyl-0.9.2}/src/nyl/tools/testing.py

@@ -1,5 +1,8 @@
 from pathlib import Path
 
+TESTDATA_PATH = Path(__file__).parent.parent.parent.parent / "testdata"
+assert TESTDATA_PATH.is_dir(), f"testdata directory ({TESTDATA_PATH}) not found"
+
 
 def create_files(prefix: str | Path, files: dict[str, str]) -> None:
     for name, content in files.items():

nyl-0.9.2/testdata/helm-test-chart/Chart.yaml

@@ -0,0 +1,3 @@
+apiVersion: v2
+name: components-test-chart
+version: '0.0.0'

nyl-0.9.2/testdata/helm-test-chart/templates/sa.yaml

@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Name }}
+  labels:
+    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/version: "1.0.0"

nyl-0.9.2/testdata/helm-test-chart/values.yaml

@@ -0,0 +1 @@
+{}

nyl-0.9.0/.changelog/0.9.0.toml

@@ -1,7 +0,0 @@
-release-date = "2025-04-15"
-
-[[entries]]
-id = "a2772016-3dff-4da6-926d-1f47e509c63a"
-type = "feature"
-description = "Add ability to define and use local variables in manifests"
-author = "@NiklasRosenstein"

nyl-0.9.0/docs/content/index.md

@@ -1,10 +0,0 @@
----
-title: Home
----
-
-# Welcome to the Nyl documentation
-
-Nyl is a flexible configuration management tool for Kubernetes resources that can be used to generate and deploy
-applications directly or integrate as an [ArgoCD ConfigManagementPlugin][CMP].
-
-  [CMP]: https://argoproj.github.io/argo-cd/operator-manual/config-management-plugins/