diff --git a/examples/nginx-deployment/module.nix b/examples/nginx-deployment/module.nix index d7e1606..aa0c2d3 100644 --- a/examples/nginx-deployment/module.nix +++ b/examples/nginx-deployment/module.nix @@ -9,7 +9,7 @@ in { docker.images.nginx.image = nginx; - kubernetes.api.deployments.nginx = { + kubernetes.resources.deployments.nginx = { spec = { replicas = 10; 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; daemon off; 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" = ''

Hello from NGINX

''; - kubernetes.api.services.nginx = { + kubernetes.resources.services.nginx = { spec = { ports = [{ name = "http"; diff --git a/tests/k8s/1.13/crd.nix b/tests/k8s/1.13/crd.nix index 837b122..71fb55f 100644 --- a/tests/k8s/1.13/crd.nix +++ b/tests/k8s/1.13/crd.nix @@ -3,13 +3,13 @@ with lib; let - cfg = config.kubernetes.api.customresourcedefinitions.crontabs; + cfg = config.kubernetes.resources.customResourceDefinitions.crontabs; in { imports = with kubenix.modules; [ test k8s ]; test = { - name = "k8s-1.13-crd"; - description = "Simple test tesing CRD for k8s 1.13"; + name = "k8s-1-13-crd"; + description = "Simple test testing CRD for k8s 1.13"; enable = builtins.compareVersions config.kubernetes.version "1.13" >= 0; assertions = [{ message = "should have versions set"; @@ -19,7 +19,7 @@ in { kubernetes.version = k8sVersion; - kubernetes.api.customresourcedefinitions.crontabs = { + kubernetes.resources.customResourceDefinitions.crontabs = { metadata.name = "crontabs.stable.example.com"; spec = { group = "stable.example.com"; diff --git a/tests/k8s/crd.nix b/tests/k8s/crd.nix index 8963b99..2ca5add 100644 --- a/tests/k8s/crd.nix +++ b/tests/k8s/crd.nix @@ -3,7 +3,7 @@ with lib; let - crd = config.kubernetes.api.resources.customresourcedefinitions.crontabs; + crd = config.kubernetes.api.resources.customResourceDefinitions.crontabs; latestCrontab = config.kubernetes.api.resources.crontabs.latest; in { imports = with kubenix.modules; [ test k8s ]; @@ -31,7 +31,7 @@ in { kubernetes.version = k8sVersion; - kubernetes.resources.customresourcedefinitions.crontabs = { + kubernetes.resources.customResourceDefinitions.crontabs = { metadata.name = "crontabs.stable.example.com"; spec = { group = "stable.example.com"; @@ -46,7 +46,7 @@ in { }; }; - kubernetes.resources.customresourcedefinitions.crontabsv2 = { + kubernetes.resources.customResourceDefinitions.crontabsv2 = { metadata.name = "crontabs.stable.example.com"; spec = { group = "stable.example.com"; diff --git a/tests/k8s/defaults.nix b/tests/k8s/defaults.nix index a2d1c67..52a1a1e 100644 --- a/tests/k8s/defaults.nix +++ b/tests/k8s/defaults.nix @@ -3,8 +3,8 @@ with lib; let - pod1 = config.kubernetes.api.pods.pod1; - pod2 = config.kubernetes.api.pods.pod2; + pod1 = config.kubernetes.api.resources.pods.pod1; + pod2 = config.kubernetes.api.resources.pods.pod2; in { imports = with kubenix.modules; [ test k8s ]; @@ -25,9 +25,9 @@ in { kubernetes.version = k8sVersion; - kubernetes.api.pods.pod1 = {}; + kubernetes.resources.pods.pod1 = {}; - kubernetes.api.pods.pod2 = { + kubernetes.resources.pods.pod2 = { metadata.labels.custom-label = "value"; }; diff --git a/tests/k8s/deployment.nix b/tests/k8s/deployment.nix index 040aa76..d4b2726 100644 --- a/tests/k8s/deployment.nix +++ b/tests/k8s/deployment.nix @@ -3,7 +3,7 @@ with lib; let - cfg = config.kubernetes.api.deployments.nginx; + cfg = config.kubernetes.api.resources.deployments.nginx; image = images.nginx; in { imports = [ kubenix.modules.test kubenix.modules.k8s kubenix.modules.docker ]; @@ -43,7 +43,7 @@ in { kubernetes.version = k8sVersion; - kubernetes.api.deployments.nginx = { + kubernetes.resources.deployments.nginx = { spec = { replicas = 10; selector.matchLabels.app = "nginx"; @@ -57,7 +57,7 @@ in { }; }; - kubernetes.api.services.nginx = { + kubernetes.resources.services.nginx = { spec = { ports = [{ name = "http"; diff --git a/tests/k8s/imports.nix b/tests/k8s/imports.nix index 2e0a0c8..a43a51a 100644 --- a/tests/k8s/imports.nix +++ b/tests/k8s/imports.nix @@ -3,8 +3,8 @@ with lib; let - pod = config.kubernetes.api.core.v1.Pod.test; - deployment = config.kubernetes.api.apps.v1.Deployment.nginx-deployment; + pod = config.kubernetes.api.resources.core.v1.Pod.test; + deployment = config.kubernetes.api.resources.apps.v1.Deployment.nginx-deployment; in { imports = with kubenix.modules; [ test k8s ]; diff --git a/tests/k8s/order.nix b/tests/k8s/order.nix index 8409269..906d286 100644 --- a/tests/k8s/order.nix +++ b/tests/k8s/order.nix @@ -3,7 +3,7 @@ with lib; let - cfg = config.kubernetes.api.customresourcedefinitions.crontabs; + cfg = config.kubernetes.api.resources.customResourceDefinitions.crontabs; in { imports = with kubenix.modules; [ test k8s ]; @@ -22,7 +22,7 @@ in { kubernetes.version = k8sVersion; - kubernetes.api.customresourcedefinitions.crontabs = { + kubernetes.resources.customResourceDefinitions.crontabs = { metadata.name = "crontabs.stable.example.com"; spec = { group = "stable.example.com"; @@ -37,12 +37,13 @@ in { }; }; - kubernetes.customResources = [{ + kubernetes.customTypes = [{ + name = "crontabs"; + description = "CronTabs resources"; + group = "stable.example.com"; version = "v1"; kind = "CronTab"; - resource = "crontabs"; - description = "CronTabs resources"; module = { options.schedule = mkOption { 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 = "* * * * *"; } diff --git a/tests/k8s/simple.nix b/tests/k8s/simple.nix index 0f8e442..72d5d8a 100644 --- a/tests/k8s/simple.nix +++ b/tests/k8s/simple.nix @@ -19,5 +19,5 @@ in { kubernetes.version = k8sVersion; - kubernetes.api.pods.nginx = {}; + kubernetes.resources.pods.nginx = {}; } diff --git a/tests/k8s/submodule.nix b/tests/k8s/submodule.nix index 5a9d23b..7998365 100644 --- a/tests/k8s/submodule.nix +++ b/tests/k8s/submodule.nix @@ -28,7 +28,7 @@ in { config = { submodule.name = "test-submodule"; - kubernetes.api.pods.nginx = { + kubernetes.resources.pods.nginx = { metadata.name = name; spec.containers.nginx.image = config.docker.images.nginx.path; };