about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--.envrc2
-rw-r--r--overrides/kontemplate/default.nix9
2 files changed, 8 insertions, 3 deletions
diff --git a/.envrc b/.envrc
index b943eb62a627..c338a93bb8c2 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 40f6b68b2962..74693c38377f 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}
 ''