mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-26 10:14:48 +00:00
nixos/rancher: use yaml 1.2 for manifests
Since https://github.com/NixOS/nixpkgs/pull/547212, a YAML directive
(`%YAML 1.1`) is added to the top of the document. See
https://yaml.org/spec/1.1/#id895631. This lets the k3s YAML parser fail
with `did not find expected <document start>`.
This affects only k3s manifests as rke2 manifests use JSON format.
(cherry picked from commit 24720865f5)
This commit is contained in:
committed by
github-actions[bot]
parent
355c24798c
commit
75fe3e04a5
@@ -29,7 +29,7 @@ let
|
||||
containerdConfigTemplateFile = "/var/lib/rancher/${name}/agent/etc/containerd/config.toml.tmpl";
|
||||
staticContentChartDir = "/var/lib/rancher/${name}/server/static/charts";
|
||||
|
||||
manifestFormat = if jsonManifests then pkgs.formats.json { } else pkgs.formats.yaml { };
|
||||
manifestFormat = if jsonManifests then pkgs.formats.json { } else pkgs.formats.yaml_1_2 { };
|
||||
# Manifests need a valid suffix to be respected
|
||||
mkManifestTarget =
|
||||
name:
|
||||
|
||||
Reference in New Issue
Block a user