From 606dbc208241be5e158832f80482e7b03d9d86db Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 11 Feb 2019 21:20:45 +0100 Subject: [PATCH] fix(k8s): crd, pass module into spec instead of root --- k8s/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/k8s/default.nix b/k8s/default.nix index 96a2937..c0c8097 100644 --- a/k8s/default.nix +++ b/k8s/default.nix @@ -88,8 +88,6 @@ in { options.${cr.group}.${cr.version}.${cr.kind} = mkOption { description = cr.description; type = types.attrsOf (types.submodule ({name, ...}: { - imports = [cr.module]; - options = { apiVersion = mkOption { description = "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources"; @@ -105,6 +103,12 @@ in { description = "Standard object metadata; More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata."; type = types.nullOr (types.submodule config.definitions."io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta"); }; + + spec = mkOption { + description = "Module spec"; + type = types.submodule cr.module; + default = {}; + }; }; config = mkMerge ([{