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

Make app-template lib kebab-case

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/default.nix
View file

@ -3,11 +3,8 @@
kubelib, kubelib,
pkgs, pkgs,
}: rec { }: 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;}; builders = import ./builders.nix {inherit kubelib pkgs;};
fetchers = import ./fetchers.nix {inherit kubelib pkgs;}; fetchers = import ./fetchers.nix {inherit kubelib pkgs;};
eureka = import ./eureka { eureka = import ./eureka {inherit app-template pkgs;};
appTemplateLib = appTemplate;
inherit pkgs;
};
} }

6
lib/eureka/default.nix
View file

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

2
releases/svc/calibre/default.nix
View file

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