fix(modules): fix customResources

This commit is contained in:
Jaka Hudoklin 2018-02-20 23:07:47 +01:00
parent 3eb8bc0731
commit d582830627
4 changed files with 56 additions and 20 deletions

View file

@ -1,4 +1,4 @@
{lib, k8s, ...}:
{lib, k8s, config, ...}:
with k8s;
with lib;
@ -40,11 +40,6 @@ with lib;
metadata.name = mkForce "${name}-nginx";
}
];
kubernetes.customResources.cron.my-awesome-cron-object = mkMerge [
(k8s.loadJSON ./cr.json)
{metadata.name = name;}
];
};
};
@ -52,15 +47,60 @@ with lib;
module = "nginx";
configuration.password.name = "test2";
configuration.password.key = "password";
configuration.kubernetes.resources.customResourceDefinitions.secret-claims = {
kind = "CustomResourceDefinition";
apiVersion = "apiextensions.k8s.io/v1beta1";
metadata.name = "secretclaims.vaultproject.io";
spec = {
group = "vaultproject.io";
version = "v1";
scope = "Namespaced";
names = {
plural = "secretclaims";
kind = "SecretClaim";
shortNames = ["scl"];
};
};
};
configuration.kubernetes.customResources.secret-claims.claim = {
metadata.name = "test";
};
};
kubernetes.modules.app-v2 = {
module = "nginx";
configuration.port = 8080;
configuration.kubernetes.modules.subsubmodule = {
module = "nginx";
configuration.kubernetes.resources.customResourceDefinitions.secret-claims = {
kind = "CustomResourceDefinition";
apiVersion = "apiextensions.k8s.io/v1beta1";
metadata.name = "secretclaims.vaultproject.io";
spec = {
group = "vaultproject.io";
version = "v1";
scope = "Namespaced";
names = {
plural = "secretclaims";
kind = "SecretClaim";
shortNames = ["scl"];
};
};
};
configuration.kubernetes.customResources.secret-claims.claim = {
metadata.name = "test";
};
};
};
kubernetes.resources.services.nginx = loadJSON ./service.json;
kubernetes.defaultModuleConfiguration.all = {
config.kubernetes.moduleDefinitions = config.kubernetes.moduleDefinitions;
config.kubernetes.defaults.deployments.spec.replicas = 3;
};