From acd93f0748407c13406cfb89fa7f2e7b1ccf8e5f Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 14 Jan 2020 19:13:33 +0000 Subject: [PATCH] fix tests and examples --- examples/nginx-deployment/default.nix | 8 ++++---- examples/nginx-deployment/test.nix | 2 +- tests/helm/simple.nix | 5 +++-- tests/k8s/crd.nix | 2 +- tests/k8s/deployment.nix | 2 +- tests/k8s/order.nix | 1 + tests/legacy/crd.nix | 14 ++++++++------ tests/module.nix | 2 +- 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/examples/nginx-deployment/default.nix b/examples/nginx-deployment/default.nix index 723e05f..e3ecfd7 100644 --- a/examples/nginx-deployment/default.nix +++ b/examples/nginx-deployment/default.nix @@ -26,11 +26,11 @@ rec { # nixos test script for running the test test-script = config.testing.testsByName.nginx-deployment.test; - # hashed kubernetes List object - result = k8s.mkHashedList { items = config.kubernetes.objects; }; + # genreated kubernetes List object + generated = config.kubernetes.generated; - # YAML file you can deploy to kubernetes - yaml = toYAML k8s-result; + # JSON file you can deploy to kubernetes + result = config.kubernetes.result; # Exported docker images images = config.docker.export; diff --git a/examples/nginx-deployment/test.nix b/examples/nginx-deployment/test.nix index b748296..4ef38c3 100644 --- a/examples/nginx-deployment/test.nix +++ b/examples/nginx-deployment/test.nix @@ -10,7 +10,7 @@ with lib; description = "Test testing nginx deployment"; testScript = '' $kube->waitUntilSucceeds("docker load < ${config.docker.images.nginx.image}"); - $kube->waitUntilSucceeds("kubectl apply -f ${toYAML config.kubernetes.generated}"); + $kube->waitUntilSucceeds("kubectl apply -f ${config.kubernetes.result}"); $kube->succeed("kubectl get deployment | grep -i nginx"); $kube->waitUntilSucceeds("kubectl get deployment -o go-template nginx --template={{.status.readyReplicas}} | grep 10"); diff --git a/tests/helm/simple.nix b/tests/helm/simple.nix index 0a73efe..061ae84 100644 --- a/tests/helm/simple.nix +++ b/tests/helm/simple.nix @@ -55,7 +55,7 @@ in { $kube->waitUntilSucceeds("docker load < ${postgresql}"); $kube->waitUntilSucceeds("docker load < ${postgresqlExporter}"); $kube->waitUntilSucceeds("docker load < ${minideb}"); - $kube->waitUntilSucceeds("kubectl apply -f ${toYAML config.kubernetes.generated}"); + $kube->waitUntilSucceeds("kubectl apply -f ${config.kubernetes.result}"); $kube->waitUntilSucceeds("PGPASSWORD=postgres ${pkgs.postgresql}/bin/psql -h app-psql-postgresql.test.svc.cluster.local -U postgres -l"); ''; }; @@ -67,7 +67,8 @@ in { kubernetes.helm.instances.app-psql = { namespace = "test"; chart = helm.fetch { - chart = "stable/postgresql"; + repo = "https://kubernetes-charts.storage.googleapis.com/"; + chart = "postgresql"; version = "3.0.0"; sha256 = "06dkn4fgvgqr27hcnbbax1ylvr4sld3rcmy1w5kanljsajbph57m"; }; diff --git a/tests/k8s/crd.nix b/tests/k8s/crd.nix index 32e984e..c588464 100644 --- a/tests/k8s/crd.nix +++ b/tests/k8s/crd.nix @@ -22,7 +22,7 @@ in { assertion = latestCrontab.apiVersion == "stable.example.com/v2"; }]; testScript = '' - $kube->waitUntilSucceeds("kubectl apply -f ${toYAML config.kubernetes.generated}"); + $kube->waitUntilSucceeds("kubectl apply -f ${config.kubernetes.result}"); $kube->succeed("kubectl get crds | grep -i crontabs"); $kube->succeed("kubectl get crontabs | grep -i versioned"); $kube->succeed("kubectl get crontabs | grep -i latest"); diff --git a/tests/k8s/deployment.nix b/tests/k8s/deployment.nix index d4b2726..d40c998 100644 --- a/tests/k8s/deployment.nix +++ b/tests/k8s/deployment.nix @@ -31,7 +31,7 @@ in { services.kubernetes.kubelet.seedDockerImages = config.docker.export; }; testScript = '' - $kube->waitUntilSucceeds("kubectl apply -f ${toYAML config.kubernetes.generated}"); + $kube->waitUntilSucceeds("kubectl apply -f ${config.kubernetes.result}"); $kube->succeed("kubectl get deployment | grep -i nginx"); $kube->waitUntilSucceeds("kubectl get deployment -o go-template nginx --template={{.status.readyReplicas}} | grep 10"); diff --git a/tests/k8s/order.nix b/tests/k8s/order.nix index 906d286..e89a778 100644 --- a/tests/k8s/order.nix +++ b/tests/k8s/order.nix @@ -41,6 +41,7 @@ in { name = "crontabs"; description = "CronTabs resources"; + attrName = "cronTabs"; group = "stable.example.com"; version = "v1"; kind = "CronTab"; diff --git a/tests/legacy/crd.nix b/tests/legacy/crd.nix index 4c5286c..cca8eea 100644 --- a/tests/legacy/crd.nix +++ b/tests/legacy/crd.nix @@ -16,14 +16,15 @@ in { test = { name = "legacy-crd"; description = "Simple test tesing kubenix legacy integration with crds crd"; + enable = builtins.compareVersions config.kubernetes.version "1.13" >= 0; assertions = [{ - message = "should define claim in module"; + message = "should define crd in module"; assertion = - hasObject {kind = "SecretClaim"; name = "secret-claim";}; + hasObject {kind = "SecretClaim"; name = "module-claim";}; } { - message = "should define claim in root"; + message = "should define crd in root"; assertion = - hasObject {kind = "SecretClaim"; name = "my-claim";}; + hasObject {kind = "SecretClaim"; name = "root-claim";}; }]; }; @@ -92,11 +93,12 @@ in { }; }; - kubernetes.modules.secret-claim = { + kubernetes.modules.module-claim = { + module = "secret-claim"; configuration.path = "tokens/test"; }; - kubernetes.customResources.secret-claims.my-claim = { + kubernetes.customResources.secret-claims.root-claim = { spec = { path = "secrets/test2"; }; diff --git a/tests/module.nix b/tests/module.nix index 0fba1d4..78070a8 100644 --- a/tests/module.nix +++ b/tests/module.nix @@ -23,7 +23,7 @@ in { }]; testScript = '' $kube->waitUntilSucceeds("docker load < ${images.nginx}"); - $kube->waitUntilSucceeds("kubectl apply -f ${toYAML config.kubernetes.generated}"); + $kube->waitUntilSucceeds("kubectl apply -f ${config.kubernetes.result}"); $kube->succeed("kubectl get deployment -n test | grep -i test-nginx"); $kube->waitUntilSucceeds("kubectl get deployment -n test -o go-template test-nginx --template={{.status.readyReplicas}} | grep 1");