mirror of
https://github.com/TECHNOFAB11/kubenix.git
synced 2025-12-12 08:00:06 +01:00
switch formatting to nixpkgs-fmt
This commit is contained in:
Bryton Hall
parent
3598716c73
commit
2712e89716
65 changed files with 4839 additions and 5222 deletions
1
.vscode/extensions.json
vendored
1
.vscode/extensions.json
vendored
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
"recommendations": [
|
||||
"jnoortheen.nix-ide",
|
||||
"mkhl.direnv"
|
||||
]
|
||||
}
|
||||
|
|
|
|||
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"git.detectSubmodules": false,
|
||||
"nix.formatterPath": "alejandra",
|
||||
"nix.enableLanguageServer": true,
|
||||
"search.exclude": {
|
||||
"docs/themes": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,5 +10,4 @@
|
|||
}
|
||||
)
|
||||
{ src = ./.; }
|
||||
)
|
||||
.defaultNix
|
||||
).defaultNix
|
||||
|
|
|
|||
|
|
@ -50,12 +50,10 @@
|
|||
|
||||
services.nginx.spec = {
|
||||
selector.app = "nginx";
|
||||
ports = [
|
||||
{
|
||||
ports = [{
|
||||
name = "http";
|
||||
port = 80;
|
||||
}
|
||||
];
|
||||
}];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,6 @@
|
|||
{ kubenix ? import ../../../.. }:
|
||||
kubenix.evalModules.${builtins.currentSystem} {
|
||||
module = {
|
||||
kubenix,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
module = { kubenix, config, pkgs, ... }: {
|
||||
imports = with kubenix.modules; [ k8s docker ];
|
||||
docker = {
|
||||
registry.url = "docker.somewhere.io";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,4 @@
|
|||
{
|
||||
dockerTools,
|
||||
nginx,
|
||||
}:
|
||||
{ dockerTools, nginx }:
|
||||
dockerTools.buildLayeredImage {
|
||||
name = "nginx";
|
||||
contents = [ nginx ];
|
||||
|
|
|
|||
|
|
@ -1,10 +1,4 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
kubenix,
|
||||
...
|
||||
}: {
|
||||
{ config, lib, pkgs, kubenix, ... }: {
|
||||
imports = with kubenix.modules; [ submodules k8s ];
|
||||
|
||||
# Import submodule.
|
||||
|
|
@ -26,12 +20,10 @@
|
|||
# Now we can set the args options defined in the submodule.
|
||||
args.kubernetes.resources = {
|
||||
services.nginx.spec = {
|
||||
ports = [
|
||||
{
|
||||
ports = [{
|
||||
name = "http";
|
||||
port = 80;
|
||||
}
|
||||
];
|
||||
}];
|
||||
selector.app = "nginx";
|
||||
};
|
||||
};
|
||||
|
|
@ -41,12 +33,10 @@
|
|||
submodule = "namespaced";
|
||||
args.kubernetes.resources = {
|
||||
services.nginx.spec = {
|
||||
ports = [
|
||||
{
|
||||
ports = [{
|
||||
name = "https";
|
||||
port = 443;
|
||||
}
|
||||
];
|
||||
}];
|
||||
selector.app = "nginx";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
{
|
||||
config,
|
||||
kubenix,
|
||||
lib,
|
||||
# Name of submodule instance.
|
||||
name,
|
||||
# This is a shorthand for config.submodule.args and contains
|
||||
{ config
|
||||
, kubenix
|
||||
, lib
|
||||
, # Name of submodule instance.
|
||||
name
|
||||
, # This is a shorthand for config.submodule.args and contains
|
||||
# final values of the args options.
|
||||
args,
|
||||
...
|
||||
args
|
||||
, ...
|
||||
}: {
|
||||
imports = with kubenix.modules; [
|
||||
# This needs to be imported in order to define a submodule.
|
||||
|
|
|
|||
|
|
@ -4,14 +4,12 @@ kubenix.evalModules.x86_64-linux {
|
|||
imports = [ kubenix.modules.testing ];
|
||||
testing = {
|
||||
tests = [ ./test.nix ];
|
||||
common = [
|
||||
{
|
||||
common = [{
|
||||
features = [ "k8s" ];
|
||||
options = {
|
||||
kubernetes.version = "1.24";
|
||||
};
|
||||
}
|
||||
];
|
||||
}];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
{
|
||||
kubenix,
|
||||
test,
|
||||
...
|
||||
}: {
|
||||
{ kubenix, test, ... }: {
|
||||
imports = [ kubenix.modules.test ];
|
||||
|
||||
test = {
|
||||
|
|
|
|||
|
|
@ -1,14 +1,10 @@
|
|||
# adapted from: https://discourse.nixos.org/t/franken-script-to-generate-nixos-options-docs-with-custom-modules/1674/4
|
||||
{
|
||||
pkgs,
|
||||
options,
|
||||
}: let
|
||||
{ pkgs, options }:
|
||||
let
|
||||
extraSources = [ ];
|
||||
lib = pkgs.lib;
|
||||
|
||||
optionsListVisible =
|
||||
lib.filter (opt: opt.visible && !opt.internal)
|
||||
(lib.optionAttrSetToDocList options);
|
||||
optionsListVisible = lib.filter (opt: opt.visible && !opt.internal) (lib.optionAttrSetToDocList options);
|
||||
|
||||
# Replace functions by the string <function>
|
||||
substFunction = x:
|
||||
|
|
@ -24,42 +20,37 @@
|
|||
|
||||
isPath = x: (builtins.typeOf x) == "path";
|
||||
|
||||
optionsListDesc = lib.flip map optionsListVisible (
|
||||
opt:
|
||||
opt
|
||||
// {
|
||||
description = let
|
||||
optionsListDesc = lib.flip map optionsListVisible (opt:
|
||||
opt // {
|
||||
description =
|
||||
let
|
||||
attempt = builtins.tryEval opt.description;
|
||||
in
|
||||
if attempt.success
|
||||
then attempt.value
|
||||
else "N/A";
|
||||
declarations = map stripAnyPrefixes opt.declarations;
|
||||
}
|
||||
// lib.optionalAttrs (opt ? example) {
|
||||
} // lib.optionalAttrs (opt ? example) {
|
||||
example = substFunction opt.example;
|
||||
}
|
||||
// lib.optionalAttrs (opt ? default) {
|
||||
} // lib.optionalAttrs (opt ? default) {
|
||||
default = substFunction opt.default;
|
||||
}
|
||||
// lib.optionalAttrs (opt ? type) {
|
||||
} // lib.optionalAttrs (opt ? type) {
|
||||
type = substFunction opt.type;
|
||||
}
|
||||
// lib.optionalAttrs
|
||||
(opt ? relatedPackages && opt.relatedPackages != [])
|
||||
{
|
||||
} // lib.optionalAttrs (opt ? relatedPackages && opt.relatedPackages != [ ]) {
|
||||
relatedPackages = genRelatedPackages opt.relatedPackages;
|
||||
}
|
||||
);
|
||||
|
||||
genRelatedPackages = packages: let
|
||||
genRelatedPackages = packages:
|
||||
let
|
||||
unpack = p:
|
||||
if lib.isString p
|
||||
then { name = p; }
|
||||
else if lib.isList p
|
||||
then { path = p; }
|
||||
else p;
|
||||
describe = args: let
|
||||
describe = args:
|
||||
let
|
||||
title = args.title or null;
|
||||
name = args.name or (lib.concatStringsSep "." args.path);
|
||||
path = args.path or [ args.name ];
|
||||
|
|
@ -82,11 +73,13 @@
|
|||
"\n<programlisting>${package.meta.longDescription}"
|
||||
+ "</programlisting>"
|
||||
+ "</listitem>";
|
||||
in "<itemizedlist>${lib.concatStringsSep "\n" (map (p:
|
||||
in
|
||||
"<itemizedlist>${lib.concatStringsSep "\n" (map (p:
|
||||
describe (unpack p))
|
||||
packages)}</itemizedlist>";
|
||||
|
||||
optionLess = a: b: let
|
||||
optionLess = a: b:
|
||||
let
|
||||
ise = lib.hasPrefix "enable";
|
||||
isp = lib.hasPrefix "package";
|
||||
cmp =
|
||||
|
|
|
|||
57
flake.nix
57
flake.nix
|
|
@ -12,8 +12,8 @@
|
|||
};
|
||||
|
||||
outputs = inputs @ { self, ... }:
|
||||
(inputs.flake-utils.lib.eachDefaultSystem (
|
||||
system: let
|
||||
(inputs.flake-utils.lib.eachDefaultSystem (system:
|
||||
let
|
||||
pkgs = import inputs.nixpkgs {
|
||||
inherit system;
|
||||
overlays = [ self.overlays.default ];
|
||||
|
|
@ -30,38 +30,31 @@
|
|||
|
||||
# evalModules with same interface as lib.evalModules and kubenix as
|
||||
# special argument
|
||||
evalModules = attrs @ {
|
||||
module ? null,
|
||||
modules ? [module],
|
||||
...
|
||||
}: let
|
||||
evalModules = attrs @ { module ? null, modules ? [ module ], ... }:
|
||||
let
|
||||
lib' = lib.extend (lib: _self: import ./lib/upstreamables.nix { inherit lib pkgs; });
|
||||
attrs' = builtins.removeAttrs attrs [ "module" ];
|
||||
in
|
||||
lib'.evalModules (lib.recursiveUpdate
|
||||
{
|
||||
modules =
|
||||
modules
|
||||
++ [
|
||||
{
|
||||
modules = modules ++ [{
|
||||
config._module.args = {
|
||||
inherit pkgs;
|
||||
name = "default";
|
||||
};
|
||||
}
|
||||
];
|
||||
}];
|
||||
specialArgs = {
|
||||
inherit kubenix;
|
||||
inherit pkgs;
|
||||
};
|
||||
}
|
||||
attrs');
|
||||
in {
|
||||
in
|
||||
{
|
||||
inherit evalModules pkgs;
|
||||
|
||||
devShells.default = pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
# extra tools
|
||||
dive
|
||||
fd
|
||||
k9s
|
||||
|
|
@ -81,11 +74,10 @@
|
|||
'';
|
||||
};
|
||||
|
||||
formatter =
|
||||
(inputs.treefmt.lib.evalModule pkgs {
|
||||
formatter = (inputs.treefmt.lib.evalModule pkgs {
|
||||
projectRootFile = "flake.nix";
|
||||
programs = {
|
||||
alejandra.enable = true;
|
||||
nixpkgs-fmt.enable = true;
|
||||
black.enable = true;
|
||||
prettier.enable = true;
|
||||
shfmt.enable = true;
|
||||
|
|
@ -95,16 +87,12 @@
|
|||
"docs/layouts/*"
|
||||
"modules/generated/*"
|
||||
];
|
||||
})
|
||||
.config
|
||||
.build
|
||||
.wrapper;
|
||||
}).config.build.wrapper;
|
||||
|
||||
apps = {
|
||||
docs = {
|
||||
type = "app";
|
||||
program =
|
||||
(pkgs.writeShellScript "gen-docs" ''
|
||||
program = (pkgs.writeShellScript "gen-docs" ''
|
||||
set -eo pipefail
|
||||
|
||||
# generate json object of module options
|
||||
|
|
@ -123,14 +111,12 @@
|
|||
|
||||
# build the site
|
||||
cd docs && ${pkgs.hugo}/bin/hugo "$@"
|
||||
'')
|
||||
.outPath;
|
||||
'').outPath;
|
||||
};
|
||||
|
||||
generate = {
|
||||
type = "app";
|
||||
program =
|
||||
(pkgs.writeShellScript "gen-modules" ''
|
||||
program = (pkgs.writeShellScript "gen-modules" ''
|
||||
set -eo pipefail
|
||||
dir=./modules/generated
|
||||
|
||||
|
|
@ -140,13 +126,11 @@
|
|||
cp ./result/* $dir/
|
||||
|
||||
rm result
|
||||
'')
|
||||
.outPath;
|
||||
'').outPath;
|
||||
};
|
||||
};
|
||||
|
||||
packages =
|
||||
{
|
||||
packages = {
|
||||
inherit (pkgs) kubernetes kubectl;
|
||||
default = pkgs.callPackage ./pkgs/kubenix.nix {
|
||||
inherit (self.packages.${system});
|
||||
|
|
@ -154,21 +138,20 @@
|
|||
};
|
||||
docs = import ./docs {
|
||||
inherit pkgs;
|
||||
options =
|
||||
(self.evalModules.${system} {
|
||||
options = (self.evalModules.${system} {
|
||||
modules = builtins.attrValues (builtins.removeAttrs
|
||||
# the submodules module currently doesn't evaluate:
|
||||
# error: No module found ‹name›/latest
|
||||
# not sure how important that documentation is a this time
|
||||
self.nixosModules.kubenix [ "submodule" "submodules" ]);
|
||||
})
|
||||
.options;
|
||||
}).options;
|
||||
};
|
||||
}
|
||||
// pkgs.lib.attrsets.mapAttrs' (name: value: pkgs.lib.attrsets.nameValuePair "generate-${name}" value)
|
||||
(builtins.removeAttrs (pkgs.callPackage ./pkgs/generators { }) [ "override" "overrideDerivation" ]);
|
||||
|
||||
checks = let
|
||||
checks =
|
||||
let
|
||||
wasSuccess = suite:
|
||||
if suite.success
|
||||
then pkgs.runCommandNoCC "testing-suite-config-assertions-for-${suite.name}-succeeded" { } "echo success > $out"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,4 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
}: {
|
||||
{ lib, pkgs }: {
|
||||
k8s = import ./k8s { inherit lib; };
|
||||
docker = import ./docker { inherit lib pkgs; };
|
||||
helm = import ./helm { inherit pkgs; };
|
||||
|
|
|
|||
|
|
@ -1,13 +1,6 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
}:
|
||||
{ lib, pkgs }:
|
||||
with lib; {
|
||||
copyDockerImages = {
|
||||
images,
|
||||
dest,
|
||||
args ? "",
|
||||
}:
|
||||
copyDockerImages = { images, dest, args ? "" }:
|
||||
pkgs.writeScript "copy-docker-images.sh" (concatMapStrings
|
||||
(image: ''
|
||||
#!${pkgs.runtimeShell}
|
||||
|
|
|
|||
|
|
@ -1,26 +1,22 @@
|
|||
{
|
||||
runCommand,
|
||||
lib,
|
||||
kubernetes-helm,
|
||||
yq,
|
||||
}:
|
||||
{ runCommand, lib, kubernetes-helm, yq }:
|
||||
with lib;
|
||||
{
|
||||
# chart to template
|
||||
chart,
|
||||
chart
|
||||
# release name
|
||||
name,
|
||||
, name
|
||||
# namespace to install release into
|
||||
namespace ? null,
|
||||
, namespace ? null
|
||||
# values to pass to chart
|
||||
values ? {},
|
||||
, values ? { }
|
||||
# kubernetes version to template chart for
|
||||
kubeVersion ? null,
|
||||
, kubeVersion ? null
|
||||
# whether to include CRD
|
||||
includeCRDs ? false,
|
||||
, includeCRDs ? false
|
||||
# whether to include hooks
|
||||
noHooks ? false,
|
||||
}: let
|
||||
, noHooks ? false
|
||||
}:
|
||||
let
|
||||
valuesJsonFile = builtins.toFile "${name}-values.json" (builtins.toJSON values);
|
||||
# The `helm template` and YAML -> JSON steps are separate `runCommand` derivations for easier debuggability
|
||||
resourcesYaml = runCommand "${name}.yaml" { nativeBuildInputs = [ kubernetes-helm ]; } ''
|
||||
|
|
|
|||
|
|
@ -1,76 +1,44 @@
|
|||
{
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
kubernetes-helm,
|
||||
cacert,
|
||||
}: let
|
||||
{ stdenvNoCC, lib, kubernetes-helm, cacert }:
|
||||
let
|
||||
cleanName = lib.replaceStrings [ "/" ] [ "-" ];
|
||||
in
|
||||
{
|
||||
# name of the chart
|
||||
chart,
|
||||
# chart url to fetch from custom location
|
||||
chartUrl ? null,
|
||||
# version of the chart
|
||||
version ? null,
|
||||
# chart hash
|
||||
sha256,
|
||||
# whether to extract chart
|
||||
untar ? true,
|
||||
# use custom charts repo
|
||||
repo ? null,
|
||||
# pass --verify to helm chart
|
||||
verify ? false,
|
||||
# pass --devel to helm chart
|
||||
devel ? false,
|
||||
chart
|
||||
, # chart url to fetch from custom location
|
||||
chartUrl ? null
|
||||
, # version of the chart
|
||||
version ? null
|
||||
, # chart hash
|
||||
sha256
|
||||
, # whether to extract chart
|
||||
untar ? true
|
||||
, # use custom charts repo
|
||||
repo ? null
|
||||
, # pass --verify to helm chart
|
||||
verify ? false
|
||||
, # pass --devel to helm chart
|
||||
devel ? false
|
||||
,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "${cleanName chart}-${
|
||||
if version == null
|
||||
then "dev"
|
||||
else version
|
||||
}";
|
||||
name = "${cleanName chart}-${ if version == null then "dev" else version }";
|
||||
|
||||
buildCommand = ''
|
||||
export HOME="$PWD"
|
||||
echo "adding helm repo"
|
||||
${
|
||||
if repo == null
|
||||
then ""
|
||||
else "helm repo add repository ${repo}"
|
||||
}
|
||||
${ if repo == null then "" else "helm repo add repository ${repo}" }
|
||||
echo "fetching helm chart"
|
||||
helm fetch -d ./chart \
|
||||
${
|
||||
if untar
|
||||
then "--untar"
|
||||
else ""
|
||||
} \
|
||||
${
|
||||
if version == null
|
||||
then ""
|
||||
else "--version ${version}"
|
||||
} \
|
||||
${
|
||||
if devel
|
||||
then "--devel"
|
||||
else ""
|
||||
} \
|
||||
${
|
||||
if verify
|
||||
then "--verify"
|
||||
else ""
|
||||
} \
|
||||
${
|
||||
if chartUrl == null
|
||||
then
|
||||
(
|
||||
${ if untar then "--untar" else ""} \
|
||||
${ if version == null then "" else "--version ${version}" } \
|
||||
${ if devel then "--devel" else "" } \
|
||||
${ if verify then "--verify" else "" } \
|
||||
${ if chartUrl == null then (
|
||||
if repo == null
|
||||
then chart
|
||||
else "repository/${chart}"
|
||||
)
|
||||
else chartUrl
|
||||
}
|
||||
) else chartUrl}
|
||||
cp -r chart/*/ $out
|
||||
'';
|
||||
outputHashMode = "recursive";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
{pkgs ? import <nixpkgs> {}}: let
|
||||
{ pkgs ? import <nixpkgs> { } }:
|
||||
let
|
||||
fetchhelm = pkgs.callPackage ./fetchhelm.nix { };
|
||||
chart2json = pkgs.callPackage ./chart2json.nix { };
|
||||
in rec {
|
||||
in
|
||||
rec {
|
||||
postgresql-chart = fetchhelm {
|
||||
chart = "stable/postgresql";
|
||||
version = "0.18.1";
|
||||
|
|
|
|||
|
|
@ -1,15 +1,10 @@
|
|||
{ lib }:
|
||||
with lib; rec {
|
||||
# TODO: refactor with mkOptionType
|
||||
mkSecretOption = {
|
||||
description ? "",
|
||||
default ? {},
|
||||
allowNull ? true,
|
||||
}:
|
||||
mkSecretOption = { description ? "", default ? { }, allowNull ? true }:
|
||||
mkOption {
|
||||
inherit description;
|
||||
type =
|
||||
(
|
||||
type = (
|
||||
if allowNull
|
||||
then types.nullOr
|
||||
else id
|
||||
|
|
@ -19,24 +14,19 @@ with lib; rec {
|
|||
description = "Name of the secret where secret is stored";
|
||||
type = types.str;
|
||||
default = default.name;
|
||||
}
|
||||
// (optionalAttrs (default ? "name") {
|
||||
} // (optionalAttrs (default ? "name") {
|
||||
default = default.name;
|
||||
}));
|
||||
|
||||
key = mkOption ({
|
||||
description = "Name of the key where secret is stored";
|
||||
type = types.str;
|
||||
}
|
||||
// (optionalAttrs (default ? "key") {
|
||||
} // (optionalAttrs (default ? "key") {
|
||||
default = default.key;
|
||||
}));
|
||||
};
|
||||
});
|
||||
default =
|
||||
if default == null
|
||||
then null
|
||||
else {};
|
||||
default = if default == null then null else { };
|
||||
};
|
||||
|
||||
secretToEnv = value: {
|
||||
|
|
@ -46,10 +36,7 @@ with lib; rec {
|
|||
};
|
||||
|
||||
# Creates kubernetes list from a list of kubernetes objects
|
||||
mkList = {
|
||||
items,
|
||||
labels ? {},
|
||||
}: {
|
||||
mkList = { items, labels ? { } }: {
|
||||
kind = "List";
|
||||
apiVersion = "v1";
|
||||
|
||||
|
|
@ -57,14 +44,11 @@ with lib; rec {
|
|||
};
|
||||
|
||||
# Creates hashed kubernetes list from a list of kubernetes objects
|
||||
mkHashedList = {
|
||||
items,
|
||||
labels ? {},
|
||||
}: let
|
||||
mkHashedList = { items, labels ? { } }:
|
||||
let
|
||||
hash = builtins.hashString "sha1" (builtins.toJSON items);
|
||||
|
||||
labeledItems =
|
||||
map
|
||||
labeledItems = map
|
||||
(item:
|
||||
recursiveUpdate item {
|
||||
metadata.labels."kubenix/hash" = hash;
|
||||
|
|
@ -73,11 +57,9 @@ with lib; rec {
|
|||
in
|
||||
mkList {
|
||||
items = labeledItems;
|
||||
labels =
|
||||
{
|
||||
labels = {
|
||||
"kubenix/hash" = hash;
|
||||
}
|
||||
// labels;
|
||||
} // labels;
|
||||
};
|
||||
|
||||
inherit (lib) toBase64;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,4 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
}:
|
||||
{ lib, pkgs }:
|
||||
with lib; let
|
||||
self = {
|
||||
importYAML = path:
|
||||
|
|
@ -38,8 +35,7 @@ with lib; let
|
|||
i = 0;
|
||||
value = 0;
|
||||
}
|
||||
(stringToCharacters value))
|
||||
.value;
|
||||
(stringToCharacters value)).value;
|
||||
};
|
||||
in
|
||||
self
|
||||
|
|
|
|||
|
|
@ -1,13 +1,8 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
docker,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, docker, ... }:
|
||||
with lib; let
|
||||
cfg = config.docker;
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = [ ./base.nix ];
|
||||
|
||||
options.docker = {
|
||||
|
|
@ -19,11 +14,7 @@ in {
|
|||
|
||||
images = mkOption {
|
||||
description = "Attribute set of docker images that should be published";
|
||||
type = types.attrsOf (types.submodule ({
|
||||
name,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
type = types.attrsOf (types.submodule ({ name, config, ... }: {
|
||||
options = {
|
||||
image = mkOption {
|
||||
description = "Docker image to publish";
|
||||
|
|
@ -89,22 +80,19 @@ in {
|
|||
_m.features = [ "docker" ];
|
||||
|
||||
# propagate docker options if docker feature is enabled
|
||||
_m.propagate = [
|
||||
{
|
||||
_m.propagate = [{
|
||||
features = [ "docker" ];
|
||||
module = _: {
|
||||
# propagate registry options
|
||||
docker.registry = cfg.registry;
|
||||
};
|
||||
}
|
||||
];
|
||||
}];
|
||||
|
||||
# pass docker library as param
|
||||
_module.args.docker = import ../lib/docker { inherit lib pkgs; };
|
||||
|
||||
# list of exported docker images
|
||||
docker.export =
|
||||
mapAttrsToList (_: i: i.image)
|
||||
docker.export = mapAttrsToList (_: i: i.image)
|
||||
(filterAttrs (_: i: i.registry != null) config.docker.images);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,6 @@
|
|||
# helm defines kubenix module with options for using helm charts
|
||||
# with kubenix
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
helm,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, helm, ... }:
|
||||
with lib; let
|
||||
cfg = config.kubernetes.helm;
|
||||
|
||||
|
|
@ -19,26 +13,25 @@ with lib; let
|
|||
merge = _loc: foldl' (res: def: recursiveUpdate res def.value) { };
|
||||
};
|
||||
|
||||
parseApiVersion = apiVersion: let
|
||||
parseApiVersion = apiVersion:
|
||||
let
|
||||
splitted = splitString "/" apiVersion;
|
||||
in {
|
||||
in
|
||||
{
|
||||
group =
|
||||
if length splitted == 1
|
||||
then "core"
|
||||
else head splitted;
|
||||
version = last splitted;
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = [ ./k8s.nix ];
|
||||
|
||||
options.kubernetes.helm = {
|
||||
releases = mkOption {
|
||||
description = "Attribute set of helm releases";
|
||||
type = types.attrsOf (types.submodule ({
|
||||
config,
|
||||
name,
|
||||
...
|
||||
}: {
|
||||
type = types.attrsOf (types.submodule ({ config, name, ... }: {
|
||||
options = {
|
||||
name = mkOption {
|
||||
description = "Helm release name";
|
||||
|
|
@ -113,11 +106,9 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
config.overrides = mkIf (config.overrideNamespace && config.namespace != null) [
|
||||
{
|
||||
config.overrides = mkIf (config.overrideNamespace && config.namespace != null) [{
|
||||
metadata.namespace = config.namespace;
|
||||
}
|
||||
];
|
||||
}];
|
||||
|
||||
config.objects = importJSON (helm.chart2json {
|
||||
inherit (config) chart name namespace values kubeVersion includeCRDs noHooks;
|
||||
|
|
@ -132,13 +123,13 @@ in {
|
|||
_module.args.helm = import ../lib/helm { inherit pkgs; };
|
||||
|
||||
kubernetes.api.resources = mkMerge (flatten (mapAttrsToList
|
||||
(
|
||||
_: release:
|
||||
map
|
||||
(object: let
|
||||
(_: release: map
|
||||
(object:
|
||||
let
|
||||
apiVersion = parseApiVersion object.apiVersion;
|
||||
inherit (object.metadata) name;
|
||||
in {
|
||||
in
|
||||
{
|
||||
"${apiVersion.group}"."${apiVersion.version}".${object.kind}."${name}" = mkMerge ([
|
||||
object
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,19 +1,13 @@
|
|||
{
|
||||
lib,
|
||||
definitions,
|
||||
}:
|
||||
{ lib, definitions }:
|
||||
with lib; {
|
||||
"istio_networking_v1alpha3_StringMatch" =
|
||||
recursiveUpdate
|
||||
(
|
||||
recursiveUpdate
|
||||
"istio_networking_v1alpha3_StringMatch" = recursiveUpdate
|
||||
(recursiveUpdate
|
||||
definitions."istio_networking_v1alpha3_StringMatch_Exact"
|
||||
definitions."istio_networking_v1alpha3_StringMatch_Prefix"
|
||||
)
|
||||
definitions."istio_networking_v1alpha3_StringMatch_Regex";
|
||||
|
||||
"istio_networking_v1alpha3_PortSelector" =
|
||||
recursiveUpdate
|
||||
"istio_networking_v1alpha3_PortSelector" = recursiveUpdate
|
||||
definitions."istio_networking_v1alpha3_PortSelector_Name"
|
||||
definitions."istio_networking_v1alpha3_PortSelector_Number";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,7 @@
|
|||
# This file was generated with kubenix k8s generator, do not edit
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{ lib, config, ... }:
|
||||
with lib; let
|
||||
types =
|
||||
lib.types
|
||||
// rec {
|
||||
types = lib.types // rec {
|
||||
str = mkOptionType {
|
||||
name = "str";
|
||||
description = "string";
|
||||
|
|
@ -22,11 +16,13 @@ with lib; let
|
|||
name = "coercedTo";
|
||||
description = "${finalType.description} or ${coercedType.description}";
|
||||
check = x: finalType.check x || coercedType.check x;
|
||||
merge = loc: defs: let
|
||||
merge = loc: defs:
|
||||
let
|
||||
coerceVal = val:
|
||||
if finalType.check val
|
||||
then val
|
||||
else let
|
||||
else
|
||||
let
|
||||
coerced = coerceFunc val;
|
||||
in
|
||||
assert finalType.check coerced; coerced;
|
||||
|
|
@ -65,12 +61,14 @@ with lib; let
|
|||
});
|
||||
|
||||
submoduleWithMergeOf = ref: mergeKey:
|
||||
types.submodule ({name, ...}: let
|
||||
types.submodule ({ name, ... }:
|
||||
let
|
||||
convertName = name:
|
||||
if definitions."${ref}".options.${mergeKey}.type == types.int
|
||||
then toInt name
|
||||
else name;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options = definitions."${ref}".options;
|
||||
config =
|
||||
definitions."${ref}".config
|
||||
|
|
@ -103,8 +101,7 @@ with lib; let
|
|||
(types.attrsOf (submoduleWithMergeOf ref mergeKey))
|
||||
);
|
||||
|
||||
definitions =
|
||||
{
|
||||
definitions = {
|
||||
"google_rpc_Status" = {
|
||||
options = {
|
||||
"code" = mkOption {
|
||||
|
|
@ -4711,7 +4708,8 @@ with lib; let
|
|||
};
|
||||
}
|
||||
// (import ./istio-overrides.nix { inherit definitions lib; });
|
||||
in {
|
||||
in
|
||||
{
|
||||
kubernetes.customResources = [
|
||||
{
|
||||
group = "networking.istio.io";
|
||||
|
|
|
|||
|
|
@ -1,12 +1,5 @@
|
|||
# K8S module defines kubernetes definitions for kubenix
|
||||
{
|
||||
options,
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
k8s,
|
||||
...
|
||||
}:
|
||||
{ options, config, lib, pkgs, k8s, ... }:
|
||||
with lib; let
|
||||
versions = (import ../versions.nix).versions;
|
||||
cfg = config.kubernetes;
|
||||
|
|
@ -15,8 +8,7 @@ with lib; let
|
|||
|
||||
getDefaults = resource: group: version: kind:
|
||||
catAttrs "default" (filter
|
||||
(
|
||||
default:
|
||||
(default:
|
||||
(resource == null || default.resource == null || default.resource == resource)
|
||||
&& (default.group == null || default.group == group)
|
||||
&& (default.version == null || default.version == version)
|
||||
|
|
@ -84,8 +76,7 @@ with lib; let
|
|||
|
||||
types = mkOption {
|
||||
description = "List of registered kubernetes types";
|
||||
type =
|
||||
coerceListOfSubmodulesToAttrs
|
||||
type = coerceListOfSubmodulesToAttrs
|
||||
{
|
||||
options = {
|
||||
group = mkOption {
|
||||
|
|
@ -133,7 +124,8 @@ with lib; let
|
|||
else -1)
|
||||
lst));
|
||||
|
||||
compareVersions = ver1: ver2: let
|
||||
compareVersions = ver1: ver2:
|
||||
let
|
||||
getVersion = substring 1 10;
|
||||
splittedVer1 = builtins.splitVersion (getVersion ver1);
|
||||
splittedVer2 = builtins.splitVersion (getVersion ver2);
|
||||
|
|
@ -155,10 +147,8 @@ with lib; let
|
|||
})
|
||||
cfg.customTypes);
|
||||
|
||||
customResourceTypesByAttrNameSortByVersion =
|
||||
mapAttrs
|
||||
(
|
||||
_: resourceTypes:
|
||||
customResourceTypesByAttrNameSortByVersion = mapAttrs
|
||||
(_: resourceTypes:
|
||||
reverseList (sort
|
||||
(
|
||||
r1: r2:
|
||||
|
|
@ -168,8 +158,7 @@ with lib; let
|
|||
)
|
||||
customResourceTypesByAttrName;
|
||||
|
||||
latestCustomResourceTypes =
|
||||
mapAttrsToList (_: last) customResourceTypesByAttrNameSortByVersion;
|
||||
latestCustomResourceTypes = mapAttrsToList (_: last) customResourceTypesByAttrNameSortByVersion;
|
||||
|
||||
customResourceModuleForType = config: ct: { name, ... }: {
|
||||
imports = getDefaults ct.name ct.group ct.version ct.kind;
|
||||
|
|
@ -203,11 +192,12 @@ with lib; let
|
|||
};
|
||||
};
|
||||
|
||||
customResourceOptions =
|
||||
(mapAttrsToList
|
||||
(_: ct: {config, ...}: let
|
||||
customResourceOptions = (mapAttrsToList
|
||||
(_: ct: { config, ... }:
|
||||
let
|
||||
module = customResourceModuleForType config ct;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.resources.${ct.group}.${ct.version}.${ct.kind} = mkOption {
|
||||
inherit (ct) description;
|
||||
type = types.attrsOf (types.submodule module);
|
||||
|
|
@ -216,13 +206,11 @@ with lib; let
|
|||
})
|
||||
cfg.customTypes)
|
||||
++ (map
|
||||
(ct: {
|
||||
options,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
(ct: { options, config, ... }:
|
||||
let
|
||||
module = customResourceModuleForType config ct;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.resources.${ct.attrName} = mkOption {
|
||||
inherit (ct) description;
|
||||
type = types.attrsOf (types.submodule module);
|
||||
|
|
@ -234,11 +222,11 @@ with lib; let
|
|||
})
|
||||
latestCustomResourceTypes);
|
||||
|
||||
coerceListOfSubmodulesToAttrs = submodule: keyFn: let
|
||||
coerceListOfSubmodulesToAttrs = submodule: keyFn:
|
||||
let
|
||||
mergeValuesByFn = keyFn: values:
|
||||
listToAttrs (map
|
||||
(
|
||||
value:
|
||||
(value:
|
||||
nameValuePair (toString (keyFn value)) value
|
||||
)
|
||||
values);
|
||||
|
|
@ -250,7 +238,8 @@ with lib; let
|
|||
name = "coercedTo";
|
||||
description = "${finalType.description} or ${coercedType.description}";
|
||||
check = x: finalType.check x || coercedType.check x;
|
||||
merge = loc: defs: let
|
||||
merge = loc: defs:
|
||||
let
|
||||
coerceVal = val:
|
||||
if finalType.check val
|
||||
then val
|
||||
|
|
@ -268,7 +257,8 @@ with lib; let
|
|||
(types.listOf (types.submodule submodule))
|
||||
(mergeValuesByFn keyFn)
|
||||
(types.attrsOf (types.submodule submodule));
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = [ ./base.nix ];
|
||||
|
||||
options.kubernetes = {
|
||||
|
|
@ -310,8 +300,7 @@ in {
|
|||
|
||||
api = mkOption {
|
||||
type = types.submodule {
|
||||
imports =
|
||||
[
|
||||
imports = [
|
||||
./generated/v${cfg.version}.nix
|
||||
apiOptions
|
||||
]
|
||||
|
|
@ -342,8 +331,7 @@ in {
|
|||
group = "helm.cattle.io";
|
||||
};
|
||||
};
|
||||
type =
|
||||
coerceListOfSubmodulesToAttrs
|
||||
type = coerceListOfSubmodulesToAttrs
|
||||
{
|
||||
options = {
|
||||
group = mkOption {
|
||||
|
|
@ -398,8 +386,7 @@ in {
|
|||
type = types.listOf types.attrs;
|
||||
apply = items:
|
||||
sort
|
||||
(
|
||||
r1: r2:
|
||||
(r1: r2:
|
||||
if elem r1.kind cfg.resourceOrder && elem r2.kind cfg.resourceOrder
|
||||
then indexOf cfg.resourceOrder r1.kind < indexOf cfg.resourceOrder r2.kind
|
||||
else if elem r1.kind cfg.resourceOrder
|
||||
|
|
@ -465,19 +452,16 @@ in {
|
|||
kubernetes.api = mkMerge ([
|
||||
{
|
||||
# register custom types
|
||||
types =
|
||||
mapAttrsToList
|
||||
types = mapAttrsToList
|
||||
(_: cr: {
|
||||
inherit (cr) name group version kind attrName;
|
||||
})
|
||||
cfg.customTypes;
|
||||
|
||||
defaults = [
|
||||
{
|
||||
defaults = [{
|
||||
default = {
|
||||
# set default kubernetes namespace to all resources
|
||||
metadata.namespace =
|
||||
mkIf (config.kubernetes.namespace != null)
|
||||
metadata.namespace = mkIf (config.kubernetes.namespace != null)
|
||||
(mkDefault config.kubernetes.namespace);
|
||||
|
||||
# set project name to all resources
|
||||
|
|
@ -486,14 +470,14 @@ in {
|
|||
"kubenix/k8s-version" = cfg.version;
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
}];
|
||||
}
|
||||
]
|
||||
++
|
||||
# import of yaml files
|
||||
(map
|
||||
(i: let
|
||||
(i:
|
||||
let
|
||||
# load yaml file
|
||||
object = importYAML i;
|
||||
groupVersion = splitString "/" object.apiVersion;
|
||||
|
|
@ -504,14 +488,14 @@ in {
|
|||
then "core"
|
||||
else head groupVersion;
|
||||
inherit (object) kind;
|
||||
in {
|
||||
in
|
||||
{
|
||||
resources.${group}.${version}.${kind}.${name} = object;
|
||||
})
|
||||
cfg.imports));
|
||||
|
||||
kubernetes.objects = flatten (mapAttrsToList
|
||||
(
|
||||
_: type:
|
||||
(_: type:
|
||||
mapAttrsToList (_name: moduleToAttrs)
|
||||
cfg.api.resources.${type.group}.${type.version}.${type.kind}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, lib, ... }:
|
||||
with lib; {
|
||||
imports = [ ./base.nix ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,4 @@
|
|||
{
|
||||
config,
|
||||
options,
|
||||
kubenix,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, options, kubenix, pkgs, lib, ... }:
|
||||
with lib; let
|
||||
cfg = config.submodules;
|
||||
parentConfig = config;
|
||||
|
|
@ -18,15 +11,9 @@ with lib; let
|
|||
else requiredVersion == version
|
||||
else true;
|
||||
|
||||
getDefaults = {
|
||||
name,
|
||||
version,
|
||||
tags,
|
||||
features,
|
||||
}:
|
||||
getDefaults = { name, version, tags, features }:
|
||||
catAttrs "default" (filter
|
||||
(
|
||||
submoduleDefault:
|
||||
(submoduleDefault:
|
||||
(submoduleDefault.name == null || submoduleDefault.name == name)
|
||||
&& (matchesVersion submoduleDefault.version version)
|
||||
&& (
|
||||
|
|
@ -40,31 +27,22 @@ with lib; let
|
|||
)
|
||||
config.submodules.defaults);
|
||||
|
||||
specialArgs =
|
||||
cfg.specialArgs
|
||||
// {
|
||||
specialArgs = cfg.specialArgs // {
|
||||
parentConfig = config;
|
||||
};
|
||||
|
||||
findSubmodule = {
|
||||
name,
|
||||
version ? null,
|
||||
latest ? true,
|
||||
}: let
|
||||
matchingSubmodules =
|
||||
filter
|
||||
(
|
||||
el:
|
||||
findSubmodule = { name, version ? null, latest ? true }:
|
||||
let
|
||||
matchingSubmodules = filter
|
||||
(el:
|
||||
el.definition.name
|
||||
== name
|
||||
&& (matchesVersion version el.definition.version)
|
||||
)
|
||||
cfg.imports;
|
||||
|
||||
versionSortedSubmodules =
|
||||
sort
|
||||
(
|
||||
s1: s2:
|
||||
versionSortedSubmodules = sort
|
||||
(s1: s2:
|
||||
if builtins.compareVersions s1.definition.version s2.definition.version > 0
|
||||
then true
|
||||
else false
|
||||
|
|
@ -83,12 +61,10 @@ with lib; let
|
|||
in
|
||||
matchingModule;
|
||||
|
||||
passthruConfig =
|
||||
mapAttrsToList
|
||||
passthruConfig = mapAttrsToList
|
||||
(name: _opt: {
|
||||
${name} = mkMerge (mapAttrsToList
|
||||
(
|
||||
_: inst:
|
||||
(_: inst:
|
||||
if inst.passthru.enable
|
||||
then inst.config.submodule.passthru.${name} or { }
|
||||
else { }
|
||||
|
|
@ -96,8 +72,7 @@ with lib; let
|
|||
config.submodules.instances);
|
||||
|
||||
_module.args = mkMerge (mapAttrsToList
|
||||
(
|
||||
_: inst:
|
||||
(_: inst:
|
||||
if inst.passthru.enable
|
||||
then inst.config.submodule.passthru._module.args or { }
|
||||
else { }
|
||||
|
|
@ -106,21 +81,22 @@ with lib; let
|
|||
})
|
||||
(removeAttrs options [ "_definedNames" "_module" "_m" "submodules" ]);
|
||||
|
||||
submoduleWithSpecialArgs = opts: specialArgs: let
|
||||
submoduleWithSpecialArgs = opts: specialArgs:
|
||||
let
|
||||
opts' = toList opts;
|
||||
inherit (lib.modules) evalModules;
|
||||
in
|
||||
mkOptionType rec {
|
||||
name = "submodule";
|
||||
check = x: isAttrs x || isFunction x;
|
||||
merge = loc: defs: let
|
||||
merge = loc: defs:
|
||||
let
|
||||
coerce = def:
|
||||
if isFunction def
|
||||
then def
|
||||
else { config = def; };
|
||||
modules =
|
||||
opts'
|
||||
++ map (def: {
|
||||
modules = opts' ++ map
|
||||
(def: {
|
||||
_file = def.file;
|
||||
imports = [ (coerce def.value) ];
|
||||
})
|
||||
|
|
@ -129,11 +105,8 @@ with lib; let
|
|||
(evalModules {
|
||||
inherit modules specialArgs;
|
||||
prefix = loc;
|
||||
})
|
||||
.config;
|
||||
getSubOptions = prefix:
|
||||
(evalModules
|
||||
{
|
||||
}).config;
|
||||
getSubOptions = prefix: (evalModules {
|
||||
modules = opts';
|
||||
inherit prefix specialArgs;
|
||||
# This is a work-around due to the fact that some sub-modules,
|
||||
|
|
@ -152,20 +125,18 @@ with lib; let
|
|||
# would be used, and use of `<` and `>` would break the XML document.
|
||||
# It shouldn't cause an issue since this is cosmetic for the manual.
|
||||
args.name = "‹name›";
|
||||
})
|
||||
.options;
|
||||
}).options;
|
||||
getSubModules = opts';
|
||||
substSubModules = m: submoduleWithSpecialArgs m specialArgs;
|
||||
functor =
|
||||
(defaultFunctor name)
|
||||
// {
|
||||
functor = (defaultFunctor name) // {
|
||||
# Merging of submodules is done as part of mergeOptionDecls, as we have to annotate
|
||||
# each submodule with its location.
|
||||
payload = [ ];
|
||||
binOp = _lhs: _rhs: [ ];
|
||||
};
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = [ ./base.nix ];
|
||||
|
||||
options = {
|
||||
|
|
@ -229,28 +200,23 @@ in {
|
|||
types.path
|
||||
(module: { inherit module; })
|
||||
(
|
||||
types.submodule ({
|
||||
name,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
types.submodule ({ name, config, ... }:
|
||||
let
|
||||
evaledSubmodule' = evalModules {
|
||||
inherit specialArgs;
|
||||
modules =
|
||||
config.modules
|
||||
modules = config.modules
|
||||
++ [ ./base.nix ]
|
||||
++ [
|
||||
{
|
||||
++ [{
|
||||
_module.args.check = false;
|
||||
}
|
||||
];
|
||||
}];
|
||||
};
|
||||
|
||||
evaledSubmodule =
|
||||
if (!(elem "submodule" evaledSubmodule'.config._m.features))
|
||||
then throw "no submodule defined"
|
||||
else evaledSubmodule';
|
||||
in {
|
||||
in
|
||||
{
|
||||
options = {
|
||||
module = mkOption {
|
||||
description = "Module defining submodule";
|
||||
|
|
@ -296,12 +262,8 @@ in {
|
|||
submodules.instances = mkOption {
|
||||
description = "Attribute set of submodule instances";
|
||||
default = { };
|
||||
type = types.attrsOf (types.submodule ({
|
||||
name,
|
||||
config,
|
||||
options,
|
||||
...
|
||||
}: let
|
||||
type = types.attrsOf (types.submodule ({ name, config, options, ... }:
|
||||
let
|
||||
# submodule associated with
|
||||
submodule = findSubmodule {
|
||||
name = config.submodule;
|
||||
|
|
@ -318,7 +280,8 @@ in {
|
|||
inherit (submoduleDefinition) tags;
|
||||
inherit (submodule) features;
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
options = {
|
||||
name = mkOption {
|
||||
description = "Submodule instance name";
|
||||
|
|
@ -349,8 +312,7 @@ in {
|
|||
|
||||
config = mkOption {
|
||||
description = "Submodule instance ${config.name} for ${submoduleDefinition.name}:${submoduleDefinition.version} config";
|
||||
type =
|
||||
submoduleWithSpecialArgs
|
||||
type = submoduleWithSpecialArgs
|
||||
({ ... }: {
|
||||
imports = submodule.modules ++ defaults ++ [ ./base.nix ];
|
||||
_module.args.pkgs = pkgs;
|
||||
|
|
@ -386,13 +348,11 @@ in {
|
|||
|
||||
# passthru kubenix.project to submodules
|
||||
submodules.defaults = mkMerge [
|
||||
[
|
||||
{
|
||||
[{
|
||||
default = {
|
||||
kubenix.project = parentConfig.kubenix.project;
|
||||
};
|
||||
}
|
||||
]
|
||||
}]
|
||||
|
||||
(map
|
||||
(propagate: {
|
||||
|
|
@ -405,8 +365,7 @@ in {
|
|||
|
||||
(mkIf cfg.propagate.enable {
|
||||
# if propagate is enabled and submodule has submodules included propagage defaults and imports
|
||||
submodules.defaults = [
|
||||
{
|
||||
submodules.defaults = [{
|
||||
features = [ "submodules" ];
|
||||
default = {
|
||||
submodules = {
|
||||
|
|
@ -414,8 +373,7 @@ in {
|
|||
inherit (cfg) imports;
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
}];
|
||||
})
|
||||
]
|
||||
++ passthruConfig);
|
||||
|
|
|
|||
|
|
@ -1,10 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
kubenix,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, kubenix, ... }:
|
||||
with lib; let
|
||||
cfg = config.testing;
|
||||
|
||||
|
|
@ -18,9 +12,9 @@ with lib; let
|
|||
};
|
||||
};
|
||||
|
||||
isTestEnabled = test:
|
||||
(cfg.enabledTests == null || elem test.name cfg.enabledTests) && test.enable;
|
||||
in {
|
||||
isTestEnabled = test: (cfg.enabledTests == null || elem test.name cfg.enabledTests) && test.enable;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./docker.nix
|
||||
./driver/kubetest.nix
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, ... }:
|
||||
with lib;
|
||||
with import ../../lib/docker { inherit lib pkgs; }; let
|
||||
inherit (config) testing;
|
||||
|
|
@ -11,7 +6,8 @@ with import ../../lib/docker {inherit lib pkgs;}; let
|
|||
allImages = unique (flatten (map (t: t.evaled.config.docker.export or [ ]) testing.tests));
|
||||
|
||||
cfg = config.testing.docker;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.testing.docker = {
|
||||
registryUrl = mkOption {
|
||||
description = "Docker registry url";
|
||||
|
|
@ -38,13 +34,11 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
config.testing.common = [
|
||||
{
|
||||
config.testing.common = [{
|
||||
features = [ "docker" ];
|
||||
options = {
|
||||
_file = "testing.docker.registryUrl";
|
||||
docker.registry.url = cfg.registryUrl;
|
||||
};
|
||||
}
|
||||
];
|
||||
}];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,23 +1,15 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{ lib, config, pkgs, ... }:
|
||||
with lib; let
|
||||
inherit (config) testing;
|
||||
cfg = testing.driver.kubetest;
|
||||
|
||||
kubetest = import ./kubetestdrv.nix { inherit pkgs; };
|
||||
|
||||
pythonEnv = pkgs.python38.withPackages (ps:
|
||||
with ps;
|
||||
[
|
||||
pythonEnv = pkgs.python38.withPackages (ps: with ps; [
|
||||
pytest
|
||||
kubetest
|
||||
kubernetes
|
||||
]
|
||||
++ cfg.extraPackages);
|
||||
] ++ cfg.extraPackages);
|
||||
|
||||
toTestScript = t:
|
||||
if isString t.script
|
||||
|
|
@ -28,7 +20,8 @@ with lib; let
|
|||
''
|
||||
else t.script;
|
||||
|
||||
tests = let
|
||||
tests =
|
||||
let
|
||||
# make sure tests are prefixed so that alphanumerical
|
||||
# sorting reproduces them in the same order as they
|
||||
# have been declared in the list.
|
||||
|
|
@ -43,9 +36,11 @@ with lib; let
|
|||
);
|
||||
op = i: t: {
|
||||
path = toTestScript t;
|
||||
name = let
|
||||
name =
|
||||
let
|
||||
prefix = lib.fixedWidthNumber listLengthPadding i;
|
||||
in "${prefix}_${t.name}_test.py";
|
||||
in
|
||||
"${prefix}_${t.name}_test.py";
|
||||
};
|
||||
in
|
||||
pkgs.linkFarm "${testing.name}-tests" (
|
||||
|
|
@ -56,7 +51,8 @@ with lib; let
|
|||
#!/usr/bin/env bash
|
||||
${pythonEnv}/bin/pytest -p no:cacheprovider ${tests} $@
|
||||
'';
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.testing.driver.kubetest = {
|
||||
defaultHeader = mkOption {
|
||||
type = types.lines;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,4 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
testing,
|
||||
kubenix,
|
||||
...
|
||||
}:
|
||||
{ lib, config, testing, kubenix, ... }:
|
||||
with lib; let
|
||||
modules = [
|
||||
# testing module
|
||||
|
|
@ -29,13 +23,9 @@ with lib; let
|
|||
|
||||
# eval without checking
|
||||
evaled' = kubenix.evalModules {
|
||||
modules =
|
||||
modules
|
||||
++ [
|
||||
{
|
||||
modules = modules ++ [{
|
||||
_module.args.check = false;
|
||||
}
|
||||
];
|
||||
}];
|
||||
};
|
||||
|
||||
# test configuration
|
||||
|
|
@ -45,10 +35,8 @@ with lib; let
|
|||
testFeatures = evaled'.config._m.features;
|
||||
|
||||
# common options that can be applied on this test
|
||||
commonOpts =
|
||||
filter
|
||||
(
|
||||
d:
|
||||
commonOpts = filter
|
||||
(d:
|
||||
(intersectLists d.features testFeatures)
|
||||
== d.features
|
||||
|| (length d.features) == 0
|
||||
|
|
@ -59,7 +47,8 @@ with lib; let
|
|||
modulesWithCommonOptions = modules ++ (map (d: d.options) commonOpts);
|
||||
|
||||
# evaled test
|
||||
evaled = let
|
||||
evaled =
|
||||
let
|
||||
evaled' = kubenix.evalModules {
|
||||
modules = modulesWithCommonOptions;
|
||||
};
|
||||
|
|
@ -69,7 +58,8 @@ with lib; let
|
|||
else if (builtins.tryEval evaled'.config.test.assertions).success
|
||||
then evaled'
|
||||
else null;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options = {
|
||||
module = mkOption {
|
||||
description = "Module defining kubenix test";
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{ lib, config, pkgs, ... }:
|
||||
with lib; let
|
||||
inherit (config) testing;
|
||||
|
||||
|
|
@ -34,7 +29,8 @@ with lib; let
|
|||
echo "--> running tests"
|
||||
${testing.testScript} --kube-config=$KUBECONFIG
|
||||
'';
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.testing.runtime.local = {
|
||||
script = mkOption {
|
||||
type = types.package;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,5 @@
|
|||
# nixos-k8s implements nixos kubernetes testing runtime
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib; let
|
||||
inherit (config) testing;
|
||||
# kubeconfig = "/etc/${config.services.kubernetes.pki.etcClusterAdminKubeconfig}";
|
||||
|
|
@ -29,8 +24,7 @@ with lib; let
|
|||
kubelet = {
|
||||
seedDockerImages = testing.docker.images;
|
||||
networkPlugin = "cni";
|
||||
cni.config = [
|
||||
{
|
||||
cni.config = [{
|
||||
name = "mynet";
|
||||
type = "bridge";
|
||||
bridge = "cni0";
|
||||
|
|
@ -41,14 +35,11 @@ with lib; let
|
|||
type = "host-local";
|
||||
subnet = "10.1.0.0/16";
|
||||
gateway = "10.1.0.1";
|
||||
routes = [
|
||||
{
|
||||
routes = [{
|
||||
dst = "0.0.0.0/0";
|
||||
}
|
||||
];
|
||||
}];
|
||||
};
|
||||
}
|
||||
];
|
||||
}];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -72,7 +63,8 @@ with lib; let
|
|||
machine1.succeed("${testing.testScript} --kube-config=${kubeconfig}")
|
||||
'';
|
||||
|
||||
test = with import "${pkgs.path}/nixos/tests/kubernetes/base.nix" {
|
||||
test = with import "${pkgs.path}/nixos/tests/kubernetes/base.nix"
|
||||
{
|
||||
inherit pkgs;
|
||||
inherit (pkgs) system;
|
||||
};
|
||||
|
|
@ -81,7 +73,8 @@ with lib; let
|
|||
inherit (config.testing) name;
|
||||
test = script;
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.testing.runtime.nixos-k8s = {
|
||||
driver = mkOption {
|
||||
description = "Test driver";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{ lib, config, ... }:
|
||||
with lib; {
|
||||
options.test = {
|
||||
name = mkOption {
|
||||
|
|
@ -37,12 +33,10 @@ with lib; {
|
|||
};
|
||||
});
|
||||
default = [ ];
|
||||
example = [
|
||||
{
|
||||
example = [{
|
||||
assertion = false;
|
||||
message = "you can't enable this for some reason";
|
||||
}
|
||||
];
|
||||
}];
|
||||
description = ''
|
||||
This option allows modules to express conditions that must
|
||||
hold for the evaluation of the system configuration to
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
stdenv,
|
||||
kubernetes,
|
||||
installShellFiles,
|
||||
{ stdenv
|
||||
, kubernetes
|
||||
, installShellFiles
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "kubectl-${kubernetes.version}";
|
||||
|
|
|
|||
|
|
@ -1,21 +1,20 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
removeReferencesTo,
|
||||
which,
|
||||
go,
|
||||
makeWrapper,
|
||||
rsync,
|
||||
installShellFiles,
|
||||
components ? [
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, removeReferencesTo
|
||||
, which
|
||||
, go
|
||||
, makeWrapper
|
||||
, rsync
|
||||
, installShellFiles
|
||||
, components ? [
|
||||
"cmd/kubelet"
|
||||
"cmd/kube-apiserver"
|
||||
"cmd/kube-controller-manager"
|
||||
"cmd/kube-proxy"
|
||||
"cmd/kube-scheduler"
|
||||
"test/e2e/e2e.test"
|
||||
],
|
||||
]
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kubernetes";
|
||||
|
|
|
|||
|
|
@ -1,37 +1,28 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
}: let
|
||||
{ pkgs, lib }:
|
||||
let
|
||||
generateIstio = import ./istio {
|
||||
inherit
|
||||
pkgs
|
||||
lib
|
||||
;
|
||||
inherit pkgs lib;
|
||||
};
|
||||
|
||||
generateK8S = name: spec:
|
||||
import ./k8s {
|
||||
inherit
|
||||
name
|
||||
pkgs
|
||||
lib
|
||||
spec
|
||||
;
|
||||
inherit name pkgs lib spec;
|
||||
};
|
||||
in {
|
||||
istio = pkgs.linkFarm "istio-generated" [
|
||||
in
|
||||
{
|
||||
istio = pkgs.linkFarm "istio-generated" [{
|
||||
name = "latest.nix";
|
||||
path = generateIstio;
|
||||
}
|
||||
];
|
||||
}];
|
||||
|
||||
k8s = pkgs.linkFarm "k8s-generated" (
|
||||
builtins.attrValues (
|
||||
builtins.mapAttrs (
|
||||
version: sha: let
|
||||
builtins.mapAttrs
|
||||
(version: sha:
|
||||
let
|
||||
short = builtins.concatStringsSep "." (lib.lists.sublist 0 2 (builtins.splitVersion version));
|
||||
in {
|
||||
in
|
||||
{
|
||||
name = "v${short}.nix";
|
||||
path = generateK8S "v${short}" (builtins.fetchurl {
|
||||
url = "https://github.com/kubernetes/kubernetes/raw/v${version}/api/openapi-spec/swagger.json";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
pkgs ? import <nixpkgs> {},
|
||||
lib ? pkgs.lib,
|
||||
spec ? ./istio-schema.json,
|
||||
{ pkgs ? import <nixpkgs> { }
|
||||
, lib ? pkgs.lib
|
||||
, spec ? ./istio-schema.json
|
||||
}:
|
||||
with lib; let
|
||||
gen = rec {
|
||||
|
|
@ -22,12 +21,7 @@ with lib; let
|
|||
|
||||
removeEmptyLines = str: concatStringsSep "\n" (filter (l: builtins.match "[[:space:]]*" l != [ ]) (splitString "\n" str));
|
||||
|
||||
mkOption = {
|
||||
description ? null,
|
||||
type ? null,
|
||||
default ? null,
|
||||
apply ? null,
|
||||
}:
|
||||
mkOption = { description ? null, type ? null, default ? null, apply ? null }:
|
||||
removeEmptyLines '' mkOption {
|
||||
${optionalString (description != null) "description = ${builtins.toJSON description};"}
|
||||
${optionalString (type != null) ''type = ${type};''}
|
||||
|
|
@ -88,10 +82,8 @@ with lib; let
|
|||
|
||||
fetchSpecs = path: builtins.fromJSON (fixJSON (builtins.readFile path));
|
||||
|
||||
genDefinitions = swagger:
|
||||
with gen; (mapAttrs
|
||||
(
|
||||
_name: definition:
|
||||
genDefinitions = swagger: with gen; (mapAttrs
|
||||
(_name: definition:
|
||||
# if $ref is in definition it means it's an alias of other definition
|
||||
if hasAttr "$ref" definition
|
||||
then definitions."${refDefinition definition}"
|
||||
|
|
@ -100,10 +92,9 @@ with lib; let
|
|||
type = mapType definition;
|
||||
}
|
||||
else {
|
||||
options =
|
||||
mapAttrs
|
||||
(
|
||||
propName: property: let
|
||||
options = mapAttrs
|
||||
(propName: property:
|
||||
let
|
||||
isRequired = elem propName (definition.required or [ ]);
|
||||
requiredOrNot = type:
|
||||
if isRequired
|
||||
|
|
@ -142,9 +133,11 @@ with lib; let
|
|||
# if x-kubernetes-patch-merge-key is set then make it an
|
||||
# attribute set of submodules
|
||||
if hasAttr "x-kubernetes-patch-merge-key" property
|
||||
then let
|
||||
then
|
||||
let
|
||||
mergeKey = property."x-kubernetes-patch-merge-key";
|
||||
in {
|
||||
in
|
||||
{
|
||||
type = requiredOrNot (coerceAttrsOfSubmodulesToListByKey (refDefinition property.items) mergeKey);
|
||||
apply = attrsToList;
|
||||
}
|
||||
|
|
@ -190,11 +183,10 @@ with lib; let
|
|||
// optionProperties)
|
||||
)
|
||||
definition.properties;
|
||||
config = let
|
||||
optionalProps =
|
||||
filterAttrs
|
||||
(
|
||||
propName: _property:
|
||||
config =
|
||||
let
|
||||
optionalProps = filterAttrs
|
||||
(propName: _property:
|
||||
!(elem propName (definition.required or [ ]))
|
||||
)
|
||||
definition.properties;
|
||||
|
|
@ -204,8 +196,7 @@ with lib; let
|
|||
)
|
||||
swagger.definitions);
|
||||
|
||||
genResources = swagger:
|
||||
(mapAttrsToList
|
||||
genResources = swagger: (mapAttrsToList
|
||||
(_name: property: rec {
|
||||
splittedType = splitString "." (removePrefix "me.snowdrop.istio.api." property.javaType);
|
||||
group = (concatStringsSep "." (take ((length splittedType) - 2) splittedType)) + ".istio.io";
|
||||
|
|
@ -214,8 +205,7 @@ with lib; let
|
|||
ref = removePrefix "#/definitions/" property."$ref";
|
||||
})
|
||||
(filterAttrs
|
||||
(
|
||||
_name: property:
|
||||
(_name: property:
|
||||
(hasPrefix "me.snowdrop.istio.api" property.javaType)
|
||||
&& hasSuffix "Spec" property.javaType
|
||||
)
|
||||
|
|
@ -229,8 +219,7 @@ with lib; let
|
|||
ref = removePrefix "#/definitions/" property."$ref";
|
||||
})
|
||||
(filterAttrs
|
||||
(
|
||||
_name: property:
|
||||
(_name: property:
|
||||
(hasPrefix "me.snowdrop.istio.mixer" property.javaType)
|
||||
&& hasSuffix "Spec" property.javaType
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
name,
|
||||
pkgs,
|
||||
lib,
|
||||
spec,
|
||||
}:
|
||||
{ name, pkgs, lib, spec }:
|
||||
with lib; let
|
||||
gen = rec {
|
||||
mkMerge = values: ''mkMerge [${concatMapStrings
|
||||
|
|
@ -23,12 +18,7 @@ with lib; let
|
|||
|
||||
removeEmptyLines = str: concatStringsSep "\n" (filter (l: builtins.match "[[:space:]]*" l != [ ]) (splitString "\n" str));
|
||||
|
||||
mkOption = {
|
||||
description ? null,
|
||||
type ? null,
|
||||
default ? null,
|
||||
apply ? null,
|
||||
}:
|
||||
mkOption = { description ? null, type ? null, default ? null, apply ? null }:
|
||||
removeEmptyLines '' mkOption {
|
||||
${optionalString (description != null) "description = ${builtins.toJSON description};"}
|
||||
${optionalString (type != null) ''type = ${type};''}
|
||||
|
|
@ -52,9 +42,7 @@ with lib; let
|
|||
loaOf = type: "(types.loaOf ${type})";
|
||||
};
|
||||
|
||||
hasTypeMapping = def:
|
||||
hasAttr "type" def
|
||||
&& elem def.type ["string" "integer" "boolean"];
|
||||
hasTypeMapping = def: hasAttr "type" def && elem def.type [ "string" "integer" "boolean" ];
|
||||
|
||||
mergeValuesByKey = mergeKey: ''(mergeValuesByKey "${mergeKey}")'';
|
||||
|
||||
|
|
@ -87,7 +75,8 @@ with lib; let
|
|||
|
||||
refType = attr: head (tail (tail (splitString "/" attr."$ref")));
|
||||
|
||||
compareVersions = ver1: ver2: let
|
||||
compareVersions = ver1: ver2:
|
||||
let
|
||||
getVersion = substring 1 10;
|
||||
splitVersion = v: builtins.splitVersion (getVersion v);
|
||||
isAlpha = v: elem "alpha" (splitVersion v);
|
||||
|
|
@ -107,11 +96,8 @@ with lib; let
|
|||
|
||||
fetchSpecs = path: builtins.fromJSON (fixJSON (builtins.readFile path));
|
||||
|
||||
genDefinitions = swagger:
|
||||
with gen;
|
||||
mapAttrs
|
||||
(
|
||||
_name: definition:
|
||||
genDefinitions = swagger: with gen; mapAttrs
|
||||
(_name: definition:
|
||||
# if $ref is in definition it means it's an alias of other definition
|
||||
if hasAttr "$ref" definition
|
||||
then definitions."${refDefinition definition}"
|
||||
|
|
@ -122,7 +108,8 @@ with lib; let
|
|||
options =
|
||||
mapAttrs
|
||||
(
|
||||
propName: property: let
|
||||
propName: property:
|
||||
let
|
||||
isRequired = elem propName (definition.required or [ ]);
|
||||
requiredOrNot = type:
|
||||
if isRequired
|
||||
|
|
@ -160,9 +147,11 @@ with lib; let
|
|||
# make it an attribute set of submodules if only x-kubernetes-patch-merge-key is present, or
|
||||
# x-kubernetes-patch-merge-key == x-kubernetes-list-map-keys.
|
||||
if (hasAttr "x-kubernetes-patch-merge-key" property) && (!(hasAttr "x-kubernetes-list-map-keys" property) || (property."x-kubernetes-list-map-keys" == [ property."x-kubernetes-patch-merge-key" ]))
|
||||
then let
|
||||
then
|
||||
let
|
||||
mergeKey = property."x-kubernetes-patch-merge-key";
|
||||
in {
|
||||
in
|
||||
{
|
||||
type = requiredOrNot (coerceAttrsOfSubmodulesToListByKey (refDefinition property.items) mergeKey [ ]);
|
||||
apply = attrsToList;
|
||||
}
|
||||
|
|
@ -173,9 +162,11 @@ with lib; let
|
|||
if
|
||||
hasAttr "properties" swagger.definitions.${refDefinition property.items}
|
||||
&& hasAttr "name" swagger.definitions.${refDefinition property.items}.properties
|
||||
then let
|
||||
then
|
||||
let
|
||||
mergeKey = "name";
|
||||
in {
|
||||
in
|
||||
{
|
||||
type = requiredOrNot (coerceAttrsOfSubmodulesToListByKey (refDefinition property.items) mergeKey (
|
||||
if hasAttr "x-kubernetes-list-map-keys" property
|
||||
then property."x-kubernetes-list-map-keys"
|
||||
|
|
@ -227,7 +218,8 @@ with lib; let
|
|||
// optionProperties)
|
||||
)
|
||||
definition.properties;
|
||||
config = let
|
||||
config =
|
||||
let
|
||||
optionalProps =
|
||||
filterAttrs
|
||||
(
|
||||
|
|
@ -241,10 +233,8 @@ with lib; let
|
|||
)
|
||||
swagger.definitions;
|
||||
|
||||
mapCharPairs = f: s1: s2:
|
||||
concatStrings (imap0
|
||||
(
|
||||
i: c1:
|
||||
mapCharPairs = f: s1: s2: concatStrings (imap0
|
||||
(i: c1:
|
||||
f i c1 (
|
||||
if i >= stringLength s2
|
||||
then ""
|
||||
|
|
@ -253,10 +243,8 @@ with lib; let
|
|||
)
|
||||
(stringToCharacters s1));
|
||||
|
||||
getAttrName = resource: kind:
|
||||
mapCharPairs
|
||||
(
|
||||
i: c1: c2:
|
||||
getAttrName = resource: kind: mapCharPairs
|
||||
(i: c1: c2:
|
||||
if hasPrefix "API" kind && i == 0
|
||||
then "A"
|
||||
else if i == 0
|
||||
|
|
@ -268,9 +256,9 @@ with lib; let
|
|||
resource
|
||||
kind;
|
||||
|
||||
genResourceTypes = swagger:
|
||||
mapAttrs'
|
||||
(name: path: let
|
||||
genResourceTypes = swagger: mapAttrs'
|
||||
(name: path:
|
||||
let
|
||||
ref = refType (head path.post.parameters).schema;
|
||||
group' = path.post."x-kubernetes-group-version-kind".group;
|
||||
version' = path.post."x-kubernetes-group-version-kind".version;
|
||||
|
|
@ -309,10 +297,8 @@ with lib; let
|
|||
})
|
||||
resourceTypes);
|
||||
|
||||
resourcesTypesByKindSortByVersion =
|
||||
mapAttrs
|
||||
(
|
||||
_kind: resourceTypes:
|
||||
resourcesTypesByKindSortByVersion = mapAttrs
|
||||
(_kind: resourceTypes:
|
||||
reverseList (sort
|
||||
(
|
||||
r1: r2:
|
||||
|
|
@ -322,8 +308,7 @@ with lib; let
|
|||
)
|
||||
resourceTypesByKind;
|
||||
|
||||
latestResourceTypesByKind =
|
||||
mapAttrs (_kind: last) resourcesTypesByKindSortByVersion;
|
||||
latestResourceTypesByKind = mapAttrs (_kind: last) resourcesTypesByKindSortByVersion;
|
||||
|
||||
genResourceOptions = resource:
|
||||
with gen; let
|
||||
|
|
|
|||
|
|
@ -1,20 +1,16 @@
|
|||
{
|
||||
kubectl,
|
||||
vals,
|
||||
colordiff,
|
||||
evalModules,
|
||||
runCommand,
|
||||
writeShellScript,
|
||||
module ? {},
|
||||
specialArgs ? {},
|
||||
}: let
|
||||
kubernetes =
|
||||
(evalModules {
|
||||
{ kubectl
|
||||
, vals
|
||||
, colordiff
|
||||
, evalModules
|
||||
, runCommand
|
||||
, writeShellScript
|
||||
, module ? { }
|
||||
, specialArgs ? { }
|
||||
}:
|
||||
let
|
||||
kubernetes = (evalModules {
|
||||
inherit module specialArgs;
|
||||
})
|
||||
.config
|
||||
.kubernetes
|
||||
or {};
|
||||
}).config.kubernetes or { };
|
||||
in
|
||||
runCommand "kubenix"
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,19 +1,14 @@
|
|||
{
|
||||
system ? builtins.currentSystem,
|
||||
evalModules ? (import ../. {}).evalModules.${system},
|
||||
}: {
|
||||
k8sVersion ? "1.23",
|
||||
registry ? throw "Registry url not defined",
|
||||
doThrowError ? true, # whether any testing error should throw an error
|
||||
enabledTests ? null,
|
||||
}: let
|
||||
{ system ? builtins.currentSystem, evalModules ? (import ../. { }).evalModules.${system} }:
|
||||
{ k8sVersion ? "1.23"
|
||||
, registry ? throw "Registry url not defined"
|
||||
, doThrowError ? true
|
||||
# whether any testing error should throw an error
|
||||
, enabledTests ? null
|
||||
}:
|
||||
let
|
||||
inherit
|
||||
((evalModules {
|
||||
module = {
|
||||
kubenix,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
module = { kubenix, pkgs, ... }: {
|
||||
imports = [ kubenix.modules.testing ];
|
||||
|
||||
testing = {
|
||||
|
|
@ -41,14 +36,12 @@
|
|||
args = { images = pkgs.callPackage ./images.nix { }; };
|
||||
docker.registryUrl = registry;
|
||||
|
||||
common = [
|
||||
{
|
||||
common = [{
|
||||
features = [ "k8s" ];
|
||||
options = {
|
||||
kubernetes.version = k8sVersion;
|
||||
};
|
||||
}
|
||||
];
|
||||
}];
|
||||
};
|
||||
};
|
||||
}))
|
||||
|
|
|
|||
|
|
@ -1,11 +1,4 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
kubenix,
|
||||
helm,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, kubenix, helm, ... }:
|
||||
with lib;
|
||||
with kubenix.lib;
|
||||
with pkgs.dockerTools; let
|
||||
|
|
@ -35,7 +28,8 @@ with pkgs.dockerTools; let
|
|||
finalImageName = "docker.io/bitnami/bitnami-shell";
|
||||
finalImageTag = "10";
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = [ kubenix.modules.test kubenix.modules.helm kubenix.modules.k8s kubenix.modules.docker ];
|
||||
|
||||
docker.images = {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
pkgs,
|
||||
dockerTools,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ pkgs, dockerTools, lib, ... }:
|
||||
with lib; {
|
||||
curl = dockerTools.buildLayeredImage {
|
||||
name = "curl";
|
||||
|
|
@ -12,7 +7,8 @@ with lib; {
|
|||
contents = [ pkgs.bash pkgs.curl pkgs.cacert ];
|
||||
};
|
||||
|
||||
nginx = let
|
||||
nginx =
|
||||
let
|
||||
nginxPort = "80";
|
||||
nginxConf = pkgs.writeText "nginx.conf" ''
|
||||
user nginx nginx;
|
||||
|
|
|
|||
|
|
@ -1,24 +1,18 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
kubenix,
|
||||
...
|
||||
}:
|
||||
{ config, lib, kubenix, ... }:
|
||||
with lib; let
|
||||
latestCrontab = config.kubernetes.api.resources.cronTabs.latest;
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = with kubenix.modules; [ test k8s ];
|
||||
|
||||
test = {
|
||||
name = "k8s-crd";
|
||||
description = "Simple test tesing CRD";
|
||||
enable = builtins.compareVersions config.kubernetes.version "1.8" >= 0;
|
||||
assertions = [
|
||||
{
|
||||
assertions = [{
|
||||
message = "Custom resource should have correct version set";
|
||||
assertion = latestCrontab.apiVersion == "stable.example.com/v2";
|
||||
}
|
||||
];
|
||||
}];
|
||||
script = ''
|
||||
@pytest.mark.applymanifest('${config.kubernetes.resultYAML}')
|
||||
def test_testing_module(kube):
|
||||
|
|
|
|||
|
|
@ -1,13 +1,9 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
kubenix,
|
||||
...
|
||||
}:
|
||||
{ config, lib, kubenix, ... }:
|
||||
with lib; let
|
||||
inherit (config.kubernetes.api.resources.pods) pod1;
|
||||
inherit (config.kubernetes.api.resources.pods) pod2;
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = with kubenix.modules; [ test k8s ];
|
||||
|
||||
test = {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,4 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
kubenix,
|
||||
images,
|
||||
test,
|
||||
...
|
||||
}:
|
||||
{ config, lib, kubenix, images, test, ... }:
|
||||
with lib; let
|
||||
cfg = config.kubernetes.api.resources.deployments.nginx;
|
||||
image = images.nginx;
|
||||
|
|
@ -17,16 +10,15 @@ with lib; let
|
|||
inherit (config.kubernetes) namespace;
|
||||
name = "curl";
|
||||
};
|
||||
spec.containers = [
|
||||
{
|
||||
spec.containers = [{
|
||||
name = "curl";
|
||||
image = config.docker.images.curl.path;
|
||||
args = [ "curl" "--retry" "20" "--retry-connrefused" "http://nginx" ];
|
||||
}
|
||||
];
|
||||
}];
|
||||
spec.restartPolicy = "Never";
|
||||
});
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = [ kubenix.modules.test kubenix.modules.k8s kubenix.modules.docker ];
|
||||
|
||||
test = {
|
||||
|
|
|
|||
|
|
@ -1,13 +1,9 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
kubenix,
|
||||
...
|
||||
}:
|
||||
{ config, lib, kubenix, ... }:
|
||||
with lib; let
|
||||
pod = config.kubernetes.api.resources.core.v1.Pod.test;
|
||||
deployment = config.kubernetes.api.resources.apps.v1.Deployment.nginx-deployment;
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = with kubenix.modules; [ test k8s ];
|
||||
|
||||
test = {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
kubenix,
|
||||
...
|
||||
}:
|
||||
{ config, lib, kubenix, ... }:
|
||||
with lib; {
|
||||
imports = with kubenix.modules; [ test k8s ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
{
|
||||
config,
|
||||
kubenix,
|
||||
...
|
||||
}: let
|
||||
{ config, kubenix, ... }:
|
||||
let
|
||||
cfg = config.kubernetes.api.resources.pods.nginx;
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = [ kubenix.modules.test kubenix.modules.k8s ];
|
||||
|
||||
test = {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,4 @@
|
|||
{
|
||||
name,
|
||||
config,
|
||||
lib,
|
||||
kubenix,
|
||||
images,
|
||||
...
|
||||
}:
|
||||
{ name, config, lib, kubenix, images, ... }:
|
||||
with lib; {
|
||||
imports = with kubenix.modules; [ test submodules k8s docker ];
|
||||
|
||||
|
|
@ -26,13 +19,8 @@ with lib; {
|
|||
|
||||
kubernetes.namespace = "test-namespace";
|
||||
|
||||
submodules.imports = [
|
||||
{
|
||||
module = {
|
||||
name,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
submodules.imports = [{
|
||||
module = { name, config, ... }: {
|
||||
imports = with kubenix.modules; [ submodule k8s docker ];
|
||||
|
||||
config = {
|
||||
|
|
@ -52,15 +40,12 @@ with lib; {
|
|||
docker.images.nginx.image = images.nginx;
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
}];
|
||||
|
||||
kubernetes.api.defaults = [
|
||||
{
|
||||
kubernetes.api.defaults = [{
|
||||
propagate = true;
|
||||
default.metadata.labels.my-label = "my-value";
|
||||
}
|
||||
];
|
||||
}];
|
||||
|
||||
submodules.instances.passthru = {
|
||||
submodule = "test-submodule";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,4 @@
|
|||
{
|
||||
name,
|
||||
config,
|
||||
lib,
|
||||
kubenix,
|
||||
...
|
||||
}:
|
||||
{ name, config, lib, kubenix, ... }:
|
||||
with lib; let
|
||||
inherit (config.submodules.instances) instance1;
|
||||
inherit (config.submodules.instances) instance2;
|
||||
|
|
@ -28,7 +22,8 @@ with lib; let
|
|||
};
|
||||
};
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = with kubenix.modules; [ test submodules ];
|
||||
|
||||
test = {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,4 @@
|
|||
{
|
||||
name,
|
||||
config,
|
||||
lib,
|
||||
kubenix,
|
||||
subm-lib,
|
||||
...
|
||||
}:
|
||||
{ name, config, lib, kubenix, subm-lib, ... }:
|
||||
with lib; let
|
||||
submodule = {
|
||||
imports = [ kubenix.modules.submodule ];
|
||||
|
|
@ -17,7 +10,8 @@ with lib; let
|
|||
};
|
||||
};
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = with kubenix.modules; [ test submodules ];
|
||||
|
||||
test = {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,4 @@
|
|||
{
|
||||
name,
|
||||
config,
|
||||
lib,
|
||||
kubenix,
|
||||
...
|
||||
}:
|
||||
{ name, config, lib, kubenix, ... }:
|
||||
with lib; let
|
||||
submodule = { name, ... }: {
|
||||
imports = [ kubenix.modules.submodule ];
|
||||
|
|
@ -14,7 +8,8 @@ with lib; let
|
|||
passthru.global.${name} = "true";
|
||||
};
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = with kubenix.modules; [ test submodules ];
|
||||
|
||||
options = {
|
||||
|
|
@ -45,11 +40,9 @@ in {
|
|||
];
|
||||
};
|
||||
|
||||
submodules.imports = [
|
||||
{
|
||||
submodules.imports = [{
|
||||
modules = [ submodule ];
|
||||
}
|
||||
];
|
||||
}];
|
||||
|
||||
submodules.instances.inst1 = {
|
||||
submodule = "subm";
|
||||
|
|
|
|||
|
|
@ -1,14 +1,9 @@
|
|||
{
|
||||
name,
|
||||
config,
|
||||
lib,
|
||||
kubenix,
|
||||
...
|
||||
}:
|
||||
{ name, config, lib, kubenix, ... }:
|
||||
with lib; let
|
||||
cfg = config.submodules.instances.instance;
|
||||
inherit (cfg.config.submodule) args;
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = with kubenix.modules; [ test submodules ];
|
||||
|
||||
test = {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,4 @@
|
|||
{
|
||||
name,
|
||||
config,
|
||||
lib,
|
||||
kubenix,
|
||||
...
|
||||
}:
|
||||
{ name, config, lib, kubenix, ... }:
|
||||
with lib; let
|
||||
inst-exact = config.submodules.instances.inst-exact.config;
|
||||
inst-regex = config.submodules.instances.inst-regex.config;
|
||||
|
|
@ -20,7 +14,8 @@ with lib; let
|
|||
|
||||
config.submodule.name = "subm";
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = with kubenix.modules; [ test submodules ];
|
||||
|
||||
test = {
|
||||
|
|
|
|||
18
versions.nix
18
versions.nix
|
|
@ -12,19 +12,17 @@ let
|
|||
"1.26.5" = "sha256:1dyqvggyvqw3z9sml2x06v1l9kynqcs8bkfrkx8jy81gkvg7qxdi";
|
||||
"1.27.2" = "sha256:1yqcds6lvpnvc5dsv9pnvp5qb3kc5y6cdgx827szljdlwf51wd15";
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
inherit full;
|
||||
# sorted list of major.minor version numbers
|
||||
# NOTE: avoiding pulling in lib here (not for any good reason)
|
||||
versions =
|
||||
map (v: let
|
||||
arr = builtins.splitVersion v;
|
||||
in (
|
||||
builtins.concatStringsSep "."
|
||||
[
|
||||
(builtins.elemAt arr 0)
|
||||
(builtins.elemAt arr 1)
|
||||
versions = with builtins; map
|
||||
(v: (
|
||||
concatStringsSep "." [
|
||||
(elemAt (splitVersion v) 0)
|
||||
(elemAt (splitVersion v) 1)
|
||||
]
|
||||
))
|
||||
(builtins.attrNames full);
|
||||
(attrNames full);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue