Refactor:

- Support for module features
- Remove kubenix.module and rather use explicit modules
- Make tests framework independent of k8s module
- Remove metacontroller submodule, which will go to kubenix-modules
- Improved submodule propagation and passthru
- Added additional test for k8s-submodule

tests/submodules/defaults.nix

@@ -9,23 +9,27 @@ let
   instance4 = config.submodules.instances.instance4;
   instance5 = config.submodules.instances.instance5;
 
-  module = {name, ...}: {
-    options.args.value = mkOption {
-      description = "Submodule value";
-      type = types.str;
-    };
+  submodule = {name, ...}: {
+    imports = [ kubenix.modules.submodule ];
 
-    options.args.defaultValue = mkOption {
-      description = "Submodule default value";
-      type = types.str;
+    options = {
+      args.value = mkOption {
+        description = "Submodule value";
+        type = types.str;
+      };
+
+      args.defaultValue = mkOption {
+        description = "Submodule default value";
+        type = types.str;
+      };
     };
   };
 in {
   imports = with kubenix.modules; [ test submodules ];
 
   test = {
-    name = "submodules-defatuls";
-    description = "Simple k8s submodule test";
+    name = "submodules-defaults";
+    description = "Simple submodule test";
     assertions = [{
       message = "should apply defaults by tag1";
       assertion = instance1.config.args.value == "value1";
@@ -53,34 +57,34 @@ in {
   };
 
   submodules.imports = [{
-    modules = [module {
+    modules = [submodule {
       submodule = {
         name = "submodule1";
         tags = ["tag1"];
       };
     }];
   } {
-    modules = [module {
+    modules = [submodule {
       submodule = {
         name = "submodule2";
         tags = ["tag2"];
       };
     }];
   } {
-    modules = [module {
+    modules = [submodule {
       submodule = {
         name = "submodule3";
         tags = ["tag2"];
       };
     }];
   } {
-    modules = [module {
+    modules = [submodule {
       submodule = {
         name = "submodule4";
       };
     }];
   } {
-    modules = [module {
+    modules = [submodule {
       submodule = {
         name = "submodule5";
       };

tests/submodules/simple.nix

@@ -25,20 +25,30 @@ in {
     } {
       message = "Should have submodule name set";
       assertion = cfg.config.args.name == "instance";
+    } {
+      message = "should have tag set";
+      assertion = elem "tag" (cfg.config.submodule.tags);
     }];
   };
 
+  submodules.propagate.enable = true;
   submodules.imports = [{
     module = {name, ...}: {
-      config.submodule.name = "submodule";
-      options.args.value = mkOption {
-        description = "Submodule argument";
-        type = types.str;
+      imports = [ kubenix.modules.submodule ];
+      config = {
+        submodule.name = "submodule";
+        submodule.tags = ["tag"];
       };
-      options.args.name = mkOption {
-        description = "Submodule name";
-        type = types.str;
-        default = name;
+      options = {
+        args.value = mkOption {
+          description = "Submodule argument";
+          type = types.str;
+        };
+        args.name = mkOption {
+          description = "Submodule name";
+          type = types.str;
+          default = name;
+        };
       };
     };
   }];

tests/submodules/versioning.nix

@@ -8,12 +8,14 @@ let
   inst-latest = config.submodules.instances.inst-latest.config;
 
   submodule = {
-    config.submodule.name = "subm";
+    imports = [ kubenix.modules.submodule ];
 
     options.version = mkOption {
       type = types.str;
       default = "undefined";
     };
+
+    config.submodule.name = "subm";
   };
 in {
   imports = with kubenix.modules; [ test submodules ];