technofab/kubenix
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/kubenix.git synced 2025-12-12 16:10:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

statix fix

Browse source
This commit is contained in:
GTrunSec 2022-04-02 13:43:57 -07:00
parent 890b84be5e
commit 6a720a257e
No known key found for this signature in database
GPG key ID: 2368FAFA4ABDD2A0
27 changed files with 86 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/base.nix
View file

@ -18,7 +18,7 @@ with lib; {
_m.propagate = mkOption {
description = "Module propagation options";
type = types.listOf (types.submodule ({ ...}: {
type = types.listOf (types.submodule (_: {
options = {
features = mkOption {
description = "List of features that submodule has to have to propagate module";

4
modules/docker.nix
View file

@ -86,9 +86,7 @@ in {
_m.propagate = [
{
features = ["docker"];
module = {
...
}: {
module = _: {
# propagate registry options
docker.registry = cfg.registry;
};

10
modules/generated/v1.19.nix
View file

@ -39,8 +39,8 @@ with lib; let
else let coerced = coerceFunc val; in assert finalType.check coerced; coerced;
in
finalType.merge loc (map (def: def // {value = coerceVal def.value;}) defs);
getSubOptions = finalType.getSubOptions;
getSubModules = finalType.getSubModules;
inherit (finalType) getSubOptions;
inherit (finalType) getSubModules;
substSubModules = m: coercedTo coercedType coerceFunc (finalType.substSubModules m);
typeMerge = _t1: _t2: null;
functor = (defaultFunctor name) // {wrapped = finalType;};
@ -62,7 +62,7 @@ with lib; let
values);
submoduleOf = ref:
types.submodule ({ ...}: {
types.submodule (_: {
options = definitions."${ref}".options or {};
config = definitions."${ref}".config or {};
});
@ -74,7 +74,7 @@ with lib; let
then toInt name
else name;
in {
options = definitions."${ref}".options;
inherit (definitions."${ref}") options;
config =
definitions."${ref}".config
// {
@ -90,7 +90,7 @@ with lib; let
in
types.submodule ({name, ...}: {
imports = getDefaults resource group version kind;
options = definitions."${ref}".options;
inherit (definitions."${ref}") options;
config = mkMerge [
definitions."${ref}".config
{

10
modules/generated/v1.20.nix
View file

@ -39,8 +39,8 @@ with lib; let
else let coerced = coerceFunc val; in assert finalType.check coerced; coerced;
in
finalType.merge loc (map (def: def // {value = coerceVal def.value;}) defs);
getSubOptions = finalType.getSubOptions;
getSubModules = finalType.getSubModules;
inherit (finalType) getSubOptions;
inherit (finalType) getSubModules;
substSubModules = m: coercedTo coercedType coerceFunc (finalType.substSubModules m);
typeMerge = _t1: _t2: null;
functor = (defaultFunctor name) // {wrapped = finalType;};
@ -62,7 +62,7 @@ with lib; let
values);
submoduleOf = ref:
types.submodule ({ ...}: {
types.submodule (_: {
options = definitions."${ref}".options or {};
config = definitions."${ref}".config or {};
});
@ -74,7 +74,7 @@ with lib; let
then toInt name
else name;
in {
options = definitions."${ref}".options;
inherit (definitions."${ref}") options;
config =
definitions."${ref}".config
// {
@ -90,7 +90,7 @@ with lib; let
in
types.submodule ({name, ...}: {
imports = getDefaults resource group version kind;
options = definitions."${ref}".options;
inherit (definitions."${ref}") options;
config = mkMerge [
definitions."${ref}".config
{

10
modules/generated/v1.21.nix
View file

@ -39,8 +39,8 @@ with lib; let
else let coerced = coerceFunc val; in assert finalType.check coerced; coerced;
in
finalType.merge loc (map (def: def // {value = coerceVal def.value;}) defs);
getSubOptions = finalType.getSubOptions;
getSubModules = finalType.getSubModules;
inherit (finalType) getSubOptions;
inherit (finalType) getSubModules;
substSubModules = m: coercedTo coercedType coerceFunc (finalType.substSubModules m);
typeMerge = _t1: _t2: null;
functor = (defaultFunctor name) // {wrapped = finalType;};
@ -62,7 +62,7 @@ with lib; let
values);
submoduleOf = ref:
types.submodule ({ ...}: {
types.submodule (_: {
options = definitions."${ref}".options or {};
config = definitions."${ref}".config or {};
});
@ -74,7 +74,7 @@ with lib; let
then toInt name
else name;
in {
options = definitions."${ref}".options;
inherit (definitions."${ref}") options;
config =
definitions."${ref}".config
// {
@ -90,7 +90,7 @@ with lib; let
in
types.submodule ({name, ...}: {
imports = getDefaults resource group version kind;
options = definitions."${ref}".options;
inherit (definitions."${ref}") options;
config = mkMerge [
definitions."${ref}".config
{

2
modules/helm.nix
View file

@ -112,7 +112,7 @@ in {
map
(object: let
apiVersion = parseApiVersion object.apiVersion;
name = object.metadata.name;
inherit (object.metadata) name;
in {
"${apiVersion.group}"."${apiVersion.version}".${object.kind}."${name}" = mkMerge ([
object

10
modules/istio.nix
View file

@ -32,8 +32,8 @@ with lib; let
assert finalType.check coerced; coerced;
in
finalType.merge loc (map (def: def // {value = coerceVal def.value;}) defs);
getSubOptions = finalType.getSubOptions;
getSubModules = finalType.getSubModules;
inherit (finalType) getSubOptions;
inherit (finalType) getSubModules;
substSubModules = m: coercedTo coercedType coerceFunc (finalType.substSubModules m);
typeMerge = _t1: _t2: null;
functor = (defaultFunctor name) // {wrapped = finalType;};
@ -41,9 +41,9 @@ with lib; let
};
submoduleOf = ref:
types.submodule ({ ...}: {
options = definitions."${ref}".options;
config = definitions."${ref}".config;
types.submodule (_: {
inherit (definitions."${ref}") options;
inherit (definitions."${ref}") config;
});
definitions =

35
modules/k8s.nix
View file

@ -25,9 +25,9 @@ with lib; let
moduleToAttrs = value:
if isAttrs value
then mapAttrs (_n: v: moduleToAttrs v) (filterAttrs (n: v: v != null && !(hasPrefix "_" n)) value)
then mapAttrs (_n: moduleToAttrs) (filterAttrs (n: v: v != null && !(hasPrefix "_" n)) value)
else if isList value
then map (v: moduleToAttrs v) value
then map moduleToAttrs value
else value;
apiOptions = {config, ...}: {
@ -38,7 +38,7 @@ with lib; let
defaults = mkOption {
description = "Kubernetes defaults to apply to resources";
type = types.listOf (types.submodule ({ ...}: {
type = types.listOf (types.submodule (_: {
options = {
group = mkOption {
description = "Group to apply default to (all by default)";
@ -132,7 +132,7 @@ with lib; let
lst));
compareVersions = ver1: ver2: let
getVersion = v: substring 1 10 v;
getVersion = substring 1 10;
splittedVer1 = builtins.splitVersion (getVersion ver1);
splittedVer2 = builtins.splitVersion (getVersion ver2);
@ -167,7 +167,7 @@ with lib; let
customResourceTypesByAttrName;
latestCustomResourceTypes =
mapAttrsToList (_: resources: last resources) customResourceTypesByAttrNameSortByVersion;
mapAttrsToList (_: last) customResourceTypesByAttrNameSortByVersion;
customResourceModuleForType = config: ct: {name, ...}: {
imports = getDefaults ct.name ct.group ct.version ct.kind;
@ -207,7 +207,7 @@ with lib; let
module = customResourceModuleForType config ct;
in {
options.resources.${ct.group}.${ct.version}.${ct.kind} = mkOption {
description = ct.description;
inherit (ct) description;
type = types.attrsOf (types.submodule module);
default = {};
};
@ -222,7 +222,7 @@ with lib; let
module = customResourceModuleForType config ct;
in {
options.resources.${ct.attrName} = mkOption {
description = ct.description;
inherit (ct) description;
type = types.attrsOf (types.submodule module);
default = {};
};
@ -255,8 +255,8 @@ with lib; let
else let coerced = coerceFunc val; in assert finalType.check coerced; coerced;
in
finalType.merge loc (map (def: def // {value = coerceVal def.value;}) defs);
getSubOptions = finalType.getSubOptions;
getSubModules = finalType.getSubModules;
inherit (finalType) getSubOptions;
inherit (finalType) getSubModules;
substSubModules = m: coercedTo coercedType coerceFunc (finalType.substSubModules m);
typeMerge = _t1: _t2: null;
functor = (defaultFunctor name) // {wrapped = finalType;};
@ -405,7 +405,7 @@ in {
_m.propagate = [
{
features = ["k8s"];
module = { ...}: {
module = _: {
# propagate kubernetes version and namespace
kubernetes.version = mkDefault cfg.version;
kubernetes.namespace = mkDefault cfg.namespace;
@ -415,9 +415,7 @@ in {
features = ["k8s" "submodule"];
module = {config, ...}: {
# set module defaults
kubernetes.api.defaults = (
# propagate defaults if default propagation is enabled
(filter (default: default.propagate) cfg.api.defaults)
kubernetes.api.defaults = (filter (default: default.propagate) cfg.api.defaults)
++ [
# set module name and version for all kuberentes resources
{
@ -426,8 +424,7 @@ in {
"kubenix/module-version" = config.submodule.version;
};
}
]
);
];
};
}
];
@ -470,13 +467,13 @@ in {
# load yaml file
object = importYAML i;
groupVersion = splitString "/" object.apiVersion;
name = object.metadata.name;
inherit (object.metadata) name;
version = last groupVersion;
group =
if version == (head groupVersion)
then "core"
else head groupVersion;
kind = object.kind;
inherit (object) kind;
in {
resources.${group}.${version}.${kind}.${name} = object;
})
@ -485,7 +482,7 @@ in {
kubernetes.objects = flatten (mapAttrsToList
(
_: type:
mapAttrsToList (_name: resource: moduleToAttrs resource)
mapAttrsToList (_name: moduleToAttrs)
cfg.api.resources.${type.group}.${type.version}.${type.kind}
)
cfg.api.types);
@ -500,6 +497,6 @@ in {
pkgs.writeText "${config.kubenix.project}-generated.json" (builtins.toJSON cfg.generated);
kubernetes.resultYAML =
toMultiDocumentYaml "${config.kubenix.project}-generated.yaml" (config.kubernetes.objects);
toMultiDocumentYaml "${config.kubenix.project}-generated.yaml" config.kubernetes.objects;
};
}

20
modules/submodules.nix
View file

@ -177,7 +177,7 @@ in {
submodules.defaults = mkOption {
description = "List of defaults to apply to submodule instances";
type = types.listOf (types.submodule ({ ...}: {
type = types.listOf (types.submodule (_: {
options = {
name = mkOption {
description = "Name of the submodule to apply defaults for";
@ -279,7 +279,7 @@ in {
inherit (evaledSubmodule.config.submodule) name description version tags exports;
};
features = evaledSubmodule.config._m.features;
inherit (evaledSubmodule.config._m) features;
};
})
)
@ -299,7 +299,7 @@ in {
# submodule associated with
submodule = findSubmodule {
name = config.submodule;
version = config.version;
inherit (config) version;
};
# definition of a submodule
@ -307,10 +307,10 @@ in {
# submodule defaults
defaults = getDefaults {
name = submoduleDefinition.name;
version = submoduleDefinition.version;
tags = submoduleDefinition.tags;
features = submodule.features;
inherit (submoduleDefinition) name;
inherit (submoduleDefinition) version;
inherit (submoduleDefinition) tags;
inherit (submodule) features;
};
in {
options = {
@ -390,7 +390,7 @@ in {
(map
(propagate: {
features = propagate.features;
inherit (propagate) features;
default = propagate.module;
})
config._m.propagate)
@ -404,8 +404,8 @@ in {
features = ["submodules"];
default = {
submodules = {
defaults = cfg.defaults;
imports = cfg.imports;
inherit (cfg) defaults;
inherit (cfg) imports;
};
};
}

4
modules/testing/default.nix
View file

@ -43,7 +43,7 @@ in {
common = mkOption {
description = "List of common options to apply to tests";
type = types.listOf (types.submodule ({ ...}: {
type = types.listOf (types.submodule (_: {
options = {
features = mkOption {
description = "List of features that test has to have to apply options";
@ -70,7 +70,7 @@ in {
inherit module;
})
(types.submodule testModule));
apply = tests: filter isTestEnabled tests;
apply = filter isTestEnabled;
};
testsByName = mkOption {

4
modules/testing/docker.nix
View file

@ -6,7 +6,7 @@
}:
with lib;
with import ../../lib/docker {inherit lib pkgs;}; let
testing = config.testing;
inherit (config) testing;
allImages = unique (flatten (map (t: t.evaled.config.docker.export or []) testing.tests));
@ -33,7 +33,7 @@ in {
images = allImages;
copyScript = copyDockerImages {
images = cfg.images;
inherit (cfg) images;
dest = "docker://" + cfg.registryUrl;
};
};

2
modules/testing/driver/kubetest.nix
View file

@ -5,7 +5,7 @@
...
}:
with lib; let
testing = config.testing;
inherit (config) testing;
cfg = testing.driver.kubetest;
kubetest = import ./kubetestdrv.nix {inherit pkgs;};

2
modules/testing/runtime/local.nix
View file

@ -5,7 +5,7 @@
...
}:
with lib; let
testing = config.testing;
inherit (config) testing;
script = pkgs.writeScript "run-local-k8s-tests-${testing.name}.sh" ''
#!${pkgs.runtimeShell}

2
modules/testing/runtime/nixos-k8s.nix
View file

@ -6,7 +6,7 @@
...
}:
with lib; let
testing = config.testing;
inherit (config) testing;
# kubeconfig = "/etc/${config.services.kubernetes.pki.etcClusterAdminKubeconfig}";
kubeconfig = "/etc/kubernetes/cluster-admin.kubeconfig";
kubecerts = "/var/lib/kubernetes/secrets";