1
0
Fork 0
mirror of https://git.sr.ht/~goorzhel/turboprop synced 2024-12-14 11:37:37 +00:00

Make app-template lib kebab-case

To reduce collisions with lib.eureka.appTemplate, and because
bjw-s' chart and the Nix module for it are both kebab-case.
This commit is contained in:
Antonio Gurgel 2023-11-19 11:38:46 -08:00
parent 408befb503
commit 46ec341d3e
3 changed files with 6 additions and 9 deletions

View file

@ -3,11 +3,8 @@
kubelib,
pkgs,
}: rec {
appTemplate = import ./app-template.nix {inherit charts kubelib pkgs;};
app-template = import ./app-template.nix {inherit charts kubelib pkgs;};
builders = import ./builders.nix {inherit kubelib pkgs;};
fetchers = import ./fetchers.nix {inherit kubelib pkgs;};
eureka = import ./eureka {
appTemplateLib = appTemplate;
inherit pkgs;
};
eureka = import ./eureka {inherit app-template pkgs;};
}

View file

@ -1,5 +1,5 @@
{
appTemplateLib,
app-template,
pkgs,
}: let
vars = import ./vars.nix;
@ -35,7 +35,7 @@ in {
configVolume = {
persistence.config =
if nfsConfigVolume
then appTemplateLib.mkExistingClaim "svc" name
then app-template.mkExistingClaim "svc" name
else
# TODO: There's room here to chain other types, like
# if longhornVolume then {...} else ...
@ -50,5 +50,5 @@ in {
(configVolume // httpRoute)
extraValues;
in
appTemplateLib.build {inherit name namespace mainImage values;};
app-template.build {inherit name namespace mainImage values;};
}

View file

@ -14,7 +14,7 @@
};
persistence = {
books = lib.appTemplate.mkExistingClaim "media" "book/calibre";
books = lib.app-template.mkExistingClaim "media" "book/calibre";
};
};
};