From 495b6481c1ca6831382c743d8fb551f7109e68e3 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 20 Dec 2019 20:55:25 +0000 Subject: [PATCH] feat(overrides/kontemplate): Automatically use primary-cluster.yaml --- .envrc | 2 +- overrides/kontemplate/default.nix | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.envrc b/.envrc index b943eb62a..c338a93bb 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 40f6b68b2..74693c383 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} ''