diff options
| author | Vincent Ambo <tazjin@google.com> | 2019-12-20T20·55+0000 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2019-12-20T20·55+0000 |
| commit | 495b6481c1ca6831382c743d8fb551f7109e68e3 (patch) | |
| tree | ea85730b97a4dfaf2a3eebc440ae0cff954ee506 | |
| parent | 49fd50bc8a71afd4c4053426e47051f05483c31c (diff) | |
feat(overrides/kontemplate): Automatically use primary-cluster.yaml r/242
| -rw-r--r-- | .envrc | 2 | ||||
| -rw-r--r-- | overrides/kontemplate/default.nix | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/.envrc b/.envrc index b943eb62a6..c338a93bb8 100644 --- a/.envrc +++ b/.envrc @@ -4,4 +4,4 @@ export PATH="${PWD}/bin:${PATH}" export NIX_PATH="nixpkgs=${PWD}/default.nix" export REPO_ROOT="${PWD}" -export SECRETS_DIR="${PWD}/secrets" +export SECRETS_DIR="${PWD}/ops/secrets" diff --git a/overrides/kontemplate/default.nix b/overrides/kontemplate/default.nix index 40f6b68b29..74693c3837 100644 --- a/overrides/kontemplate/default.nix +++ b/overrides/kontemplate/default.nix @@ -9,6 +9,11 @@ let master = pkgs.third_party.kontemplate.overrideAttrs(_: { }; }); in pkgs.third_party.writeShellScriptBin "kontemplate" '' - export PATH="${pkgs.tools.kms_pass}/bin:$PATH" - exec ${master}/bin/kontemplate $@ + export PATH="${pkgs.ops.kms_pass}/bin:$PATH" + + if [[ -z $1 ]]; then + exec ${master}/bin/kontemplate + fi + + exec ${master}/bin/kontemplate $1 ${./../..}/ops/infra/kubernetes/primary-cluster.yaml ''${@:2} '' |