diff --git a/modules/helm.nix b/modules/helm.nix index 8934a2a..682d9d7 100644 --- a/modules/helm.nix +++ b/modules/helm.nix @@ -95,7 +95,7 @@ in { # expose helm helper methods as module argument _module.args.helm = import ../lib/helm { inherit pkgs; }; - kubernetes.api = mkMerge (flatten (mapAttrsToList (_: instance: + kubernetes.api.resources = mkMerge (flatten (mapAttrsToList (_: instance: map (object: let apiVersion = parseApiVersion object.apiVersion; name = object.metadata.name; diff --git a/tests/helm/simple.nix b/tests/helm/simple.nix index 436e687..0a73efe 100644 --- a/tests/helm/simple.nix +++ b/tests/helm/simple.nix @@ -5,8 +5,8 @@ with kubenix.lib; with pkgs.dockerTools; let - corev1 = config.kubernetes.api.core.v1; - appsv1beta2 = config.kubernetes.api.apps.v1beta2; + corev1 = config.kubernetes.api.resources.core.v1; + appsv1beta2 = config.kubernetes.api.resources.apps.v1beta2; postgresql = pullImage { imageName = "docker.io/bitnami/postgresql"; @@ -62,14 +62,14 @@ in { kubernetes.version = k8sVersion; - kubernetes.api.namespaces.test = {}; + kubernetes.resources.namespaces.test = {}; kubernetes.helm.instances.app-psql = { namespace = "test"; chart = helm.fetch { chart = "stable/postgresql"; version = "3.0.0"; - sha256 = "0icnnpcqvf1hqn7fc9niyifd0amlm9jfrx3iks0y360rk8wndbch"; + sha256 = "06dkn4fgvgqr27hcnbbax1ylvr4sld3rcmy1w5kanljsajbph57m"; }; values = { diff --git a/tests/k8s/simple.nix b/tests/k8s/simple.nix index 72d5d8a..f9fe32a 100644 --- a/tests/k8s/simple.nix +++ b/tests/k8s/simple.nix @@ -1,7 +1,7 @@ { config, kubenix, k8sVersion, ... }: let - cfg = config.kubernetes.api.pods.nginx; + cfg = config.kubernetes.api.resources.pods.nginx; in { imports = [ kubenix.modules.test kubenix.modules.k8s ];