fix tests

This commit is contained in:
Jaka Hudoklin 2019-10-10 13:28:48 +02:00
parent e9dbb01005
commit 28d2b4baac
No known key found for this signature in database
GPG key ID: D1F18234B07BD6E2
3 changed files with 6 additions and 6 deletions

View file

@ -95,7 +95,7 @@ in {
# expose helm helper methods as module argument # expose helm helper methods as module argument
_module.args.helm = import ../lib/helm { inherit pkgs; }; _module.args.helm = import ../lib/helm { inherit pkgs; };
kubernetes.api = mkMerge (flatten (mapAttrsToList (_: instance: kubernetes.api.resources = mkMerge (flatten (mapAttrsToList (_: instance:
map (object: let map (object: let
apiVersion = parseApiVersion object.apiVersion; apiVersion = parseApiVersion object.apiVersion;
name = object.metadata.name; name = object.metadata.name;

View file

@ -5,8 +5,8 @@ with kubenix.lib;
with pkgs.dockerTools; with pkgs.dockerTools;
let let
corev1 = config.kubernetes.api.core.v1; corev1 = config.kubernetes.api.resources.core.v1;
appsv1beta2 = config.kubernetes.api.apps.v1beta2; appsv1beta2 = config.kubernetes.api.resources.apps.v1beta2;
postgresql = pullImage { postgresql = pullImage {
imageName = "docker.io/bitnami/postgresql"; imageName = "docker.io/bitnami/postgresql";
@ -62,14 +62,14 @@ in {
kubernetes.version = k8sVersion; kubernetes.version = k8sVersion;
kubernetes.api.namespaces.test = {}; kubernetes.resources.namespaces.test = {};
kubernetes.helm.instances.app-psql = { kubernetes.helm.instances.app-psql = {
namespace = "test"; namespace = "test";
chart = helm.fetch { chart = helm.fetch {
chart = "stable/postgresql"; chart = "stable/postgresql";
version = "3.0.0"; version = "3.0.0";
sha256 = "0icnnpcqvf1hqn7fc9niyifd0amlm9jfrx3iks0y360rk8wndbch"; sha256 = "06dkn4fgvgqr27hcnbbax1ylvr4sld3rcmy1w5kanljsajbph57m";
}; };
values = { values = {

View file

@ -1,7 +1,7 @@
{ config, kubenix, k8sVersion, ... }: { config, kubenix, k8sVersion, ... }:
let let
cfg = config.kubernetes.api.pods.nginx; cfg = config.kubernetes.api.resources.pods.nginx;
in { in {
imports = [ kubenix.modules.test kubenix.modules.k8s ]; imports = [ kubenix.modules.test kubenix.modules.k8s ];