mirror of
https://github.com/TECHNOFAB11/kubenix.git
synced 2025-12-12 08:00:06 +01:00
fix(tests): new resource naming
This commit is contained in:
parent
ec3f7ecb10
commit
2f3669a961
9 changed files with 30 additions and 29 deletions
|
|
@ -9,7 +9,7 @@ in {
|
||||||
|
|
||||||
docker.images.nginx.image = nginx;
|
docker.images.nginx.image = nginx;
|
||||||
|
|
||||||
kubernetes.api.deployments.nginx = {
|
kubernetes.resources.deployments.nginx = {
|
||||||
spec = {
|
spec = {
|
||||||
replicas = 10;
|
replicas = 10;
|
||||||
selector.matchLabels.app = "nginx";
|
selector.matchLabels.app = "nginx";
|
||||||
|
|
@ -30,7 +30,7 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
kubernetes.api.configmaps.nginx-config.data."nginx.conf" = ''
|
kubernetes.resources.configMaps.nginx-config.data."nginx.conf" = ''
|
||||||
user nginx nginx;
|
user nginx nginx;
|
||||||
daemon off;
|
daemon off;
|
||||||
error_log /dev/stdout info;
|
error_log /dev/stdout info;
|
||||||
|
|
@ -48,11 +48,11 @@ in {
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
kubernetes.api.configmaps.nginx-static.data."index.html" = ''
|
kubernetes.resources.configMaps.nginx-static.data."index.html" = ''
|
||||||
<html><body><h1>Hello from NGINX</h1></body></html>
|
<html><body><h1>Hello from NGINX</h1></body></html>
|
||||||
'';
|
'';
|
||||||
|
|
||||||
kubernetes.api.services.nginx = {
|
kubernetes.resources.services.nginx = {
|
||||||
spec = {
|
spec = {
|
||||||
ports = [{
|
ports = [{
|
||||||
name = "http";
|
name = "http";
|
||||||
|
|
|
||||||
|
|
@ -3,13 +3,13 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.kubernetes.api.customresourcedefinitions.crontabs;
|
cfg = config.kubernetes.resources.customResourceDefinitions.crontabs;
|
||||||
in {
|
in {
|
||||||
imports = with kubenix.modules; [ test k8s ];
|
imports = with kubenix.modules; [ test k8s ];
|
||||||
|
|
||||||
test = {
|
test = {
|
||||||
name = "k8s-1.13-crd";
|
name = "k8s-1-13-crd";
|
||||||
description = "Simple test tesing CRD for k8s 1.13";
|
description = "Simple test testing CRD for k8s 1.13";
|
||||||
enable = builtins.compareVersions config.kubernetes.version "1.13" >= 0;
|
enable = builtins.compareVersions config.kubernetes.version "1.13" >= 0;
|
||||||
assertions = [{
|
assertions = [{
|
||||||
message = "should have versions set";
|
message = "should have versions set";
|
||||||
|
|
@ -19,7 +19,7 @@ in {
|
||||||
|
|
||||||
kubernetes.version = k8sVersion;
|
kubernetes.version = k8sVersion;
|
||||||
|
|
||||||
kubernetes.api.customresourcedefinitions.crontabs = {
|
kubernetes.resources.customResourceDefinitions.crontabs = {
|
||||||
metadata.name = "crontabs.stable.example.com";
|
metadata.name = "crontabs.stable.example.com";
|
||||||
spec = {
|
spec = {
|
||||||
group = "stable.example.com";
|
group = "stable.example.com";
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
crd = config.kubernetes.api.resources.customresourcedefinitions.crontabs;
|
crd = config.kubernetes.api.resources.customResourceDefinitions.crontabs;
|
||||||
latestCrontab = config.kubernetes.api.resources.crontabs.latest;
|
latestCrontab = config.kubernetes.api.resources.crontabs.latest;
|
||||||
in {
|
in {
|
||||||
imports = with kubenix.modules; [ test k8s ];
|
imports = with kubenix.modules; [ test k8s ];
|
||||||
|
|
@ -31,7 +31,7 @@ in {
|
||||||
|
|
||||||
kubernetes.version = k8sVersion;
|
kubernetes.version = k8sVersion;
|
||||||
|
|
||||||
kubernetes.resources.customresourcedefinitions.crontabs = {
|
kubernetes.resources.customResourceDefinitions.crontabs = {
|
||||||
metadata.name = "crontabs.stable.example.com";
|
metadata.name = "crontabs.stable.example.com";
|
||||||
spec = {
|
spec = {
|
||||||
group = "stable.example.com";
|
group = "stable.example.com";
|
||||||
|
|
@ -46,7 +46,7 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
kubernetes.resources.customresourcedefinitions.crontabsv2 = {
|
kubernetes.resources.customResourceDefinitions.crontabsv2 = {
|
||||||
metadata.name = "crontabs.stable.example.com";
|
metadata.name = "crontabs.stable.example.com";
|
||||||
spec = {
|
spec = {
|
||||||
group = "stable.example.com";
|
group = "stable.example.com";
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,8 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
pod1 = config.kubernetes.api.pods.pod1;
|
pod1 = config.kubernetes.api.resources.pods.pod1;
|
||||||
pod2 = config.kubernetes.api.pods.pod2;
|
pod2 = config.kubernetes.api.resources.pods.pod2;
|
||||||
in {
|
in {
|
||||||
imports = with kubenix.modules; [ test k8s ];
|
imports = with kubenix.modules; [ test k8s ];
|
||||||
|
|
||||||
|
|
@ -25,9 +25,9 @@ in {
|
||||||
|
|
||||||
kubernetes.version = k8sVersion;
|
kubernetes.version = k8sVersion;
|
||||||
|
|
||||||
kubernetes.api.pods.pod1 = {};
|
kubernetes.resources.pods.pod1 = {};
|
||||||
|
|
||||||
kubernetes.api.pods.pod2 = {
|
kubernetes.resources.pods.pod2 = {
|
||||||
metadata.labels.custom-label = "value";
|
metadata.labels.custom-label = "value";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.kubernetes.api.deployments.nginx;
|
cfg = config.kubernetes.api.resources.deployments.nginx;
|
||||||
image = images.nginx;
|
image = images.nginx;
|
||||||
in {
|
in {
|
||||||
imports = [ kubenix.modules.test kubenix.modules.k8s kubenix.modules.docker ];
|
imports = [ kubenix.modules.test kubenix.modules.k8s kubenix.modules.docker ];
|
||||||
|
|
@ -43,7 +43,7 @@ in {
|
||||||
|
|
||||||
kubernetes.version = k8sVersion;
|
kubernetes.version = k8sVersion;
|
||||||
|
|
||||||
kubernetes.api.deployments.nginx = {
|
kubernetes.resources.deployments.nginx = {
|
||||||
spec = {
|
spec = {
|
||||||
replicas = 10;
|
replicas = 10;
|
||||||
selector.matchLabels.app = "nginx";
|
selector.matchLabels.app = "nginx";
|
||||||
|
|
@ -57,7 +57,7 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
kubernetes.api.services.nginx = {
|
kubernetes.resources.services.nginx = {
|
||||||
spec = {
|
spec = {
|
||||||
ports = [{
|
ports = [{
|
||||||
name = "http";
|
name = "http";
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,8 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
pod = config.kubernetes.api.core.v1.Pod.test;
|
pod = config.kubernetes.api.resources.core.v1.Pod.test;
|
||||||
deployment = config.kubernetes.api.apps.v1.Deployment.nginx-deployment;
|
deployment = config.kubernetes.api.resources.apps.v1.Deployment.nginx-deployment;
|
||||||
in {
|
in {
|
||||||
imports = with kubenix.modules; [ test k8s ];
|
imports = with kubenix.modules; [ test k8s ];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.kubernetes.api.customresourcedefinitions.crontabs;
|
cfg = config.kubernetes.api.resources.customResourceDefinitions.crontabs;
|
||||||
in {
|
in {
|
||||||
imports = with kubenix.modules; [ test k8s ];
|
imports = with kubenix.modules; [ test k8s ];
|
||||||
|
|
||||||
|
|
@ -22,7 +22,7 @@ in {
|
||||||
|
|
||||||
kubernetes.version = k8sVersion;
|
kubernetes.version = k8sVersion;
|
||||||
|
|
||||||
kubernetes.api.customresourcedefinitions.crontabs = {
|
kubernetes.resources.customResourceDefinitions.crontabs = {
|
||||||
metadata.name = "crontabs.stable.example.com";
|
metadata.name = "crontabs.stable.example.com";
|
||||||
spec = {
|
spec = {
|
||||||
group = "stable.example.com";
|
group = "stable.example.com";
|
||||||
|
|
@ -37,12 +37,13 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
kubernetes.customResources = [{
|
kubernetes.customTypes = [{
|
||||||
|
name = "crontabs";
|
||||||
|
description = "CronTabs resources";
|
||||||
|
|
||||||
group = "stable.example.com";
|
group = "stable.example.com";
|
||||||
version = "v1";
|
version = "v1";
|
||||||
kind = "CronTab";
|
kind = "CronTab";
|
||||||
resource = "crontabs";
|
|
||||||
description = "CronTabs resources";
|
|
||||||
module = {
|
module = {
|
||||||
options.schedule = mkOption {
|
options.schedule = mkOption {
|
||||||
description = "Crontab schedule script";
|
description = "Crontab schedule script";
|
||||||
|
|
@ -51,7 +52,7 @@ in {
|
||||||
};
|
};
|
||||||
}];
|
}];
|
||||||
|
|
||||||
kubernetes.api.namespaces.test = {};
|
kubernetes.resources.namespaces.test = {};
|
||||||
|
|
||||||
kubernetes.api."stable.example.com"."v1".CronTab.crontab.spec.schedule = "* * * * *";
|
kubernetes.resources."stable.example.com"."v1".CronTab.crontab.spec.schedule = "* * * * *";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,5 +19,5 @@ in {
|
||||||
|
|
||||||
kubernetes.version = k8sVersion;
|
kubernetes.version = k8sVersion;
|
||||||
|
|
||||||
kubernetes.api.pods.nginx = {};
|
kubernetes.resources.pods.nginx = {};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ in {
|
||||||
config = {
|
config = {
|
||||||
submodule.name = "test-submodule";
|
submodule.name = "test-submodule";
|
||||||
|
|
||||||
kubernetes.api.pods.nginx = {
|
kubernetes.resources.pods.nginx = {
|
||||||
metadata.name = name;
|
metadata.name = name;
|
||||||
spec.containers.nginx.image = config.docker.images.nginx.path;
|
spec.containers.nginx.image = config.docker.images.nginx.path;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue