technofab/kubenix
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/kubenix.git synced 2025-12-12 16:10:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename helm instances to releases

Browse source
This commit is contained in:
Bryton Hall 2022-08-15 09:46:23 -04:00
parent 5c5191680e
commit 89e1e70bf0
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/examples/helm-chart/default.nix
View file

@ -2,7 +2,7 @@
(evalModules { (evalModules {
module = {kubenix, ...}: { module = {kubenix, ...}: {
imports = with kubenix.modules; [helm]; imports = with kubenix.modules; [helm];
kubernetes.helm.instances.example = { kubernetes.helm.releases.example = {
chart = kubenix.lib.helm.fetch { chart = kubenix.lib.helm.fetch {
chart = "nginx"; chart = "nginx";
repo = "https://charts.bitnami.com/bitnami"; repo = "https://charts.bitnami.com/bitnami";

12
modules/helm.nix
View file

@ -32,8 +32,8 @@ in {
imports = [./k8s.nix]; imports = [./k8s.nix];
options.kubernetes.helm = { options.kubernetes.helm = {
instances = mkOption { releases = mkOption {
description = "Attribute set of helm instances"; description = "Attribute set of helm releases";
type = types.attrsOf (types.submodule ({ type = types.attrsOf (types.submodule ({
config, config,
name, name,
@ -108,7 +108,7 @@ in {
kubernetes.api.resources = mkMerge (flatten (mapAttrsToList kubernetes.api.resources = mkMerge (flatten (mapAttrsToList
( (
_: instance: _: release:
map map
(object: let (object: let
apiVersion = parseApiVersion object.apiVersion; apiVersion = parseApiVersion object.apiVersion;
@ -117,10 +117,10 @@ in {
"${apiVersion.group}"."${apiVersion.version}".${object.kind}."${name}" = mkMerge ([ "${apiVersion.group}"."${apiVersion.version}".${object.kind}."${name}" = mkMerge ([
object object
] ]
++ instance.overrides); ++ release.overrides);
}) })
instance.objects release.objects
) )
cfg.instances)); cfg.releases));
}; };
} }

2
tests/helm/simple.nix
View file

@ -80,7 +80,7 @@ in {
''; '';
}; };
kubernetes.helm.instances.app-psql = { kubernetes.helm.releases.app-psql = {
namespace = "some-overridden-by-kubetest"; namespace = "some-overridden-by-kubetest";
chart = helm.fetch { chart = helm.fetch {
repo = "https://charts.bitnami.com/bitnami"; repo = "https://charts.bitnami.com/bitnami";