feat: interface and lib refactoring

This commit is contained in:
Jaka Hudoklin 2019-03-07 18:02:26 +01:00
parent e260ad9bb4
commit 5d8b66f8a0
No known key found for this signature in database
GPG key ID: 6A08896BFD32BD95
10 changed files with 111 additions and 88 deletions

View file

@ -1,6 +1,6 @@
{ pkgs ? import <nixpkgs> {}
, kubenix ? import ../. {inherit pkgs;}
, lib ? kubenix.lib
, lib ? pkgs.lib
, kubenix ? import ../. { inherit pkgs lib; }
, k8sVersions ? ["1.7" "1.8" "1.9" "1.10" "1.11" "1.12" "1.13"]
# whether any testing error should throw an error
@ -14,7 +14,7 @@ let
tests = listToAttrs (map (version: let
version' = replaceStrings ["."] ["_"] version;
in nameValuePair "v${version'}" (evalModules {
in nameValuePair "v${version'}" (kubenix.evalModules {
modules = [
kubenix.testing

View file

@ -1,7 +1,7 @@
{ config, lib, test, pkgs, kubenix, k8s, helm, ... }:
{ config, lib, test, pkgs, kubenix, helm, ... }:
with lib;
with k8s;
with kubenix.lib;
with pkgs.dockerTools;
let
@ -56,7 +56,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 ${toYAML config.kubernetes.objects}");
$kube->waitUntilSucceeds("PGPASSWORD=postgres ${pkgs.postgresql}/bin/psql -h app-psql-postgresql.test.svc.cluster.local -U postgres -l");
'';
};