flake: format

This commit is contained in:
Bryton Hall 2023-06-03 03:11:07 -04:00
parent eb3ec20f46
commit baa1a6c949
16 changed files with 86 additions and 72 deletions

View file

@ -51,10 +51,12 @@
services.nginx.spec = { services.nginx.spec = {
selector.app = "nginx"; selector.app = "nginx";
ports = [{ ports = [
{
name = "http"; name = "http";
port = 80; port = 80;
}]; }
];
}; };
}; };
} }

View file

@ -1,6 +1,11 @@
{kubenix ? import ../../../..}: {kubenix ? import ../../../..}:
kubenix.evalModules.${builtins.currentSystem} { kubenix.evalModules.${builtins.currentSystem} {
module = { kubenix, config, pkgs, ... }: { module = {
kubenix,
config,
pkgs,
...
}: {
imports = with kubenix.modules; [k8s docker]; imports = with kubenix.modules; [k8s docker];
docker = { docker = {
registry.url = "docker.somewhere.io"; registry.url = "docker.somewhere.io";

View file

@ -1,4 +1,7 @@
{ dockerTools, nginx }: {
dockerTools,
nginx,
}:
dockerTools.buildLayeredImage { dockerTools.buildLayeredImage {
name = "nginx"; name = "nginx";
contents = [nginx]; contents = [nginx];

View file

@ -4,12 +4,14 @@ kubenix.evalModules.x86_64-linux {
imports = [kubenix.modules.testing]; imports = [kubenix.modules.testing];
testing = { testing = {
tests = [./test.nix]; tests = [./test.nix];
common = [{ common = [
{
features = ["k8s"]; features = ["k8s"];
options = { options = {
kubernetes.version = "1.24"; kubernetes.version = "1.24";
}; };
}]; }
];
}; };
}; };
} }

View file

@ -1,4 +1,8 @@
{ kubenix, test, ... }: { {
kubenix,
test,
...
}: {
imports = [kubenix.modules.test]; imports = [kubenix.modules.test];
test = { test = {

View file

@ -13,19 +13,13 @@
}; };
}; };
outputs = { outputs = inputs @ {self, ...}:
self,
nixpkgs,
...
} @ inputs:
(inputs.flake-utils.lib.eachDefaultSystem ( (inputs.flake-utils.lib.eachDefaultSystem (
system: let system: let
pkgs = import inputs.nixpkgs { pkgs = import inputs.nixpkgs {
overlays = [
self.overlays.default
];
config.allowUnsupportedSystem = true;
inherit system; inherit system;
overlays = [self.overlays.default];
config.allowUnsupportedSystem = true;
}; };
inherit (pkgs) lib; inherit (pkgs) lib;

View file

@ -170,15 +170,19 @@ with lib; let
else else
# make it an attribute set of submodules if only x-kubernetes-patch-merge-key is present, or # 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. # x-kubernetes-patch-merge-key == x-kubernetes-list-map-keys.
if hasAttr "properties" swagger.definitions.${refDefinition property.items} && if
hasAttr "name" swagger.definitions.${refDefinition property.items}.properties hasAttr "properties" swagger.definitions.${refDefinition property.items}
&& hasAttr "name" swagger.definitions.${refDefinition property.items}.properties
then let then let
mergeKey = "name"; 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" else [])); type = requiredOrNot (coerceAttrsOfSubmodulesToListByKey (refDefinition property.items) mergeKey (
if hasAttr "x-kubernetes-list-map-keys" property
then property."x-kubernetes-list-map-keys"
else []
));
apply = attrsToList; apply = attrsToList;
} }
else { else {
type = type =
if (refDefinition property.items) == _name if (refDefinition property.items) == _name

View file

@ -19,7 +19,7 @@ with lib;
# kubernetes version to template chart for # kubernetes version to template chart for
kubeVersion ? null, kubeVersion ? null,
# whether to include CRD # whether to include CRD
includeCRDs ? false includeCRDs ? false,
}: let }: let
valuesJsonFile = builtins.toFile "${name}-values.json" (builtins.toJSON values); valuesJsonFile = builtins.toFile "${name}-values.json" (builtins.toJSON values);
in in
@ -31,7 +31,7 @@ with lib;
${optionalString (kubeVersion != null) "--kube-version ${kubeVersion}"} \ ${optionalString (kubeVersion != null) "--kube-version ${kubeVersion}"} \
${optionalString (namespace != null) "--namespace ${namespace}"} \ ${optionalString (namespace != null) "--namespace ${namespace}"} \
${optionalString (values != {}) "-f ${valuesJsonFile}"} \ ${optionalString (values != {}) "-f ${valuesJsonFile}"} \
${optionalString (includeCRDs) "--include-crds"} \ ${optionalString includeCRDs "--include-crds"} \
${chart} >resources.yaml ${chart} >resources.yaml
# split multy yaml file into multiple files # split multy yaml file into multiple files