From df2f00a729ce53b9ecdc7f938c6bc72526cd688d Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 6 Apr 2018 19:54:46 +0200 Subject: [PATCH] feat(modules): set default namespace from parent module namespace --- default.nix | 1 + modules.nix | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index 561d7f1..a870c0a 100644 --- a/default.nix +++ b/default.nix @@ -18,6 +18,7 @@ let inherit pkgs; inherit (pkgs) lib; }; + module = null; }; }; diff --git a/modules.nix b/modules.nix index a42ee12..2f8931e 100644 --- a/modules.nix +++ b/modules.nix @@ -1,10 +1,11 @@ -{ config, lib, pkgs, k8s, ... }: +{ config, lib, pkgs, k8s, module ? null, ... }: with lib; with import ./lib.nix { inherit pkgs lib; }; let globalConfig = config; + parentModule = module; # A submodule (like typed attribute set). See NixOS manual. submodule = opts: @@ -138,7 +139,10 @@ in { namespace = mkOption { description = "Namespace where to deploy module"; type = types.str; - default = "default"; + default = + if parentModule != null + then parentModule.namespace + else "default"; }; labels = mkOption {