diff --git a/kubernetes.nix b/kubernetes.nix index 1f0b34f..43a8c5e 100644 --- a/kubernetes.nix +++ b/kubernetes.nix @@ -308,7 +308,7 @@ let defaultOptions = mapAttrs (name: value: mkOption { description = "Kubernetes defaults for ${name} resources"; - type = types.coercedTo types.attrs (value: [value]) (types.listOf types.attrs); + type = types.coercedTo types.unspecified (value: [value]) (types.listOf types.unspecified); default = []; }) ( (versionOptions.${config.kubernetes.version}.kubernetesResourceOptions) // @@ -334,7 +334,7 @@ in { options = defaultOptions // { all = mkOption { description = "Kubernetes defaults for all resources"; - type = types.coercedTo types.attrs (value: [value]) (types.listOf types.attrs); + type = types.coercedTo types.unspecified (value: [value]) (types.listOf types.unspecified); default = []; }; }; diff --git a/modules.nix b/modules.nix index 7e80746..158b06e 100644 --- a/modules.nix +++ b/modules.nix @@ -76,7 +76,7 @@ let defaultModuleConfigurationOptions = mapAttrs (name: moduleDefinition: mkOption { description = "Module default configuration for ${name} module"; - type = types.coercedTo types.attrs (value: [value]) (types.listOf types.attrs); + type = types.coercedTo types.unspecified (value: [value]) (types.listOf types.unspecified); default = []; }) config.kubernetes.moduleDefinitions; in { @@ -104,7 +104,7 @@ in { options = defaultModuleConfigurationOptions // { all = mkOption { description = "Module default configuration for all modules"; - type = types.coercedTo types.attrs (value: [value]) (types.listOf types.attrs); + type = types.coercedTo types.unspecified (value: [value]) (types.listOf types.unspecified); default = []; }; }; diff --git a/test/modules.nix b/test/modules.nix index 0320590..762f9c5 100644 --- a/test/modules.nix +++ b/test/modules.nix @@ -99,12 +99,12 @@ with lib; kubernetes.resources.services.nginx = loadJSON ./service.json; - kubernetes.defaultModuleConfiguration.all = { - config.kubernetes.defaults.deployments.spec.replicas = 3; - }; + kubernetes.defaultModuleConfiguration.all = [{ + config.kubernetes.defaults.deployments.spec.replicas = mkDefault 3; + }]; - kubernetes.defaultModuleConfiguration.nginx = { - kubernetes.defaults.deployments.spec.replicas = mkDefault 4; + kubernetes.defaultModuleConfiguration.nginx = {config, name, ...}: { + kubernetes.defaults.deployments.spec.replicas = 4; }; }; }