From 0c99276b50e433fb80d75e18e76f0e133cca86f8 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Mon, 31 May 2021 21:45:22 -0500 Subject: [PATCH] fix: test kubernetes manifest nix-repl> test-nginx = g.config.testing.testsByName.nginx-deployment.evaled.config.kubernetes.resources.deployments.nginx nix-repl> test-nginx.spec.template.spec.containers.nginx.image "nginx:dy4y4j45arjj9sgyjb90sv035sxglpv8" vs nix-repl> nginx = g.config.kubernetes.resources.deployments.nginx nix-repl> nginx.spec.template.spec.containers.nginx.image "docker.io/gatehub/nginx:dy4y4j45arjj9sgyjb90sv035sxglpv8" --- examples/nginx-deployment/test.nix | 4 ++-- modules/testing/evalTest.nix | 2 +- tests/k8s/deployment.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/nginx-deployment/test.nix b/examples/nginx-deployment/test.nix index 8608ba8..74cfee0 100644 --- a/examples/nginx-deployment/test.nix +++ b/examples/nginx-deployment/test.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, kubenix, ... }: +{ config, lib, pkgs, kubenix, test, ... }: with lib; @@ -9,7 +9,7 @@ with lib; name = "nginx-deployment"; description = "Test testing nginx deployment"; script = '' - @pytest.mark.applymanifest('${config.kubernetes.resultYAML}') + @pytest.mark.applymanifest('${test.kubernetes.resultYAML}') def test_nginx_deployment(kube): """Tests whether nginx deployment gets successfully created""" diff --git a/modules/testing/evalTest.nix b/modules/testing/evalTest.nix index 50a714e..0c4662f 100644 --- a/modules/testing/evalTest.nix +++ b/modules/testing/evalTest.nix @@ -15,7 +15,7 @@ let kubenix.project = mkDefault config.name; _module.args = { inherit kubenix; - test = config; + test = evaled.config; } // testing.args; }; } diff --git a/tests/k8s/deployment.nix b/tests/k8s/deployment.nix index ea38cf1..f4a0684 100644 --- a/tests/k8s/deployment.nix +++ b/tests/k8s/deployment.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, kubenix, images, ... }: +{ config, lib, pkgs, kubenix, images, test, ... }: with lib; let @@ -47,7 +47,7 @@ in script = '' import time - @pytest.mark.applymanifest('${config.kubernetes.resultYAML}') + @pytest.mark.applymanifest('${test.kubernetes.resultYAML}') def test_deployment(kube): """Tests whether deployment gets successfully created"""