diff --git a/.gitattributes b/.gitattributes index 2be6974..cd0b993 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ _secrets.yaml filter=git-crypt diff=git-crypt +secrets.yaml filter=git-crypt diff=git-crypt diff --git a/requirements.txt b/requirements.txt index 645357c..5594b17 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,4 @@ PyYAML==6.0.3 requests==2.32.5 Jinja2==3.1.6 GitPython==3.1.45 +mergedeep==1.3.4 diff --git a/tools/render b/tools/render index 8794f06..3c0d385 100755 --- a/tools/render +++ b/tools/render @@ -11,6 +11,7 @@ import git import requests import yaml from jinja2 import Environment, FileSystemLoader, StrictUndefined, Template +from mergedeep import merge REPO = git.Repo(sys.path[0], search_parent_directories=True) assert REPO.working_dir is not None @@ -134,6 +135,9 @@ def main(): with open(ROOT.joinpath("config.yaml")) as fyaml: config = yaml.safe_load(fyaml) + with open(ROOT.joinpath("secrets.yaml")) as fyaml: + merge(config, yaml.safe_load(fyaml)) + template_args = {"config": config, "root": ROOT} nodes = []