Infra: get rid of makeResourceModule (#485)

Reviewed-on: Fediversity/Fediversity#485
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Reviewed-by: kiara Grouwstra <kiara@procolix.eu>
Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
Co-committed-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
This commit is contained in:
Nicolas Jeannerod 2025-07-31 00:49:00 +02:00 committed by Nicolas Jeannerod
parent be72b82875
commit df3a070fa4
17 changed files with 68 additions and 69 deletions

View file

@ -34,6 +34,7 @@ in
imports = [
./options.nix
./nixos
./proxmox-qemu-vm.nix
];
## Inject the shared options from the resource's `config` into the NixOS

View file

@ -17,59 +17,35 @@ let
;
inherit (lib.attrsets) genAttrs;
## Given a machine's name and whether it is a test VM, make a resource module,
## except for its missing provider. (Depending on the use of that resource, we
## will provide a different one.)
makeResourceModule =
{ vmName, isTestVm }:
{
# TODO(@fricklerhandwerk): this is terrible but IMO we should just ditch flake-parts and have our own data model for how the project is organised internally
_module.args = {
inherit
inputs
keys
secrets
sources
;
};
nixos.module.imports = [
## FIXME: It would be preferrable to have those `sources`-related
## imports in the modules that use them. However, doing so triggers
## infinite recursions because of the way we propagate `sources`.
## `sources` must be propagated by means of `specialArgs`, but this
## requires a bigger change.
"${sources.nixpkgs}/nixos/modules/profiles/qemu-guest.nix"
"${sources.agenix}/modules/age.nix"
"${sources.disko}/module.nix"
"${sources.home-manager}/nixos"
./common/proxmox-qemu-vm.nix
];
imports =
[
./common/resource.nix
]
++ (
if isTestVm then
[
../machines/operator/${vmName}
{
nixos.module.users.users.root.openssh.authorizedKeys.keys = [
# allow our panel vm access to the test machines
keys.panel
];
}
]
else
[
../machines/dev/${vmName}
]
);
fediversityVm.name = vmName;
commonResourceModule = {
# TODO(@fricklerhandwerk): this is terrible but IMO we should just ditch
# flake-parts and have our own data model for how the project is organised
# internally
_module.args = {
inherit
inputs
keys
secrets
sources
;
};
## FIXME: It would be preferrable to have those `sources`-related imports in
## the modules that use them. However, doing so triggers infinite recursions
## because of the way we propagate `sources`. `sources` must be propagated by
## means of `specialArgs`, but this requires a bigger change.
nixos.module.imports = [
"${sources.nixpkgs}/nixos/modules/profiles/qemu-guest.nix"
"${sources.agenix}/modules/age.nix"
"${sources.disko}/module.nix"
"${sources.home-manager}/nixos"
];
imports = [
./common/resource.nix
];
};
## Given a list of machine names, make a deployment with those machines'
## configurations as resources.
makeDeployment =
@ -81,10 +57,8 @@ let
type = providers.local.exec;
imports = [
inputs.nixops4-nixos.modules.nixops4Resource.nixos
(makeResourceModule {
inherit vmName;
isTestVm = false;
})
commonResourceModule
../machines/dev/${vmName}
];
});
};
@ -101,21 +75,29 @@ let
fediversity = import ../services/fediversity;
}
{
garageConfigurationResource = makeResourceModule {
vmName = "test01";
isTestVm = true;
garageConfigurationResource = {
imports = [
commonResourceModule
../machines/operator/test01
];
};
mastodonConfigurationResource = makeResourceModule {
vmName = "test06"; # somehow `test02` has a problem - use test06 instead
isTestVm = true;
mastodonConfigurationResource = {
imports = [
commonResourceModule
../machines/operator/test06 # somehow `test02` has a problem - use test06 instead
];
};
peertubeConfigurationResource = makeResourceModule {
vmName = "test05";
isTestVm = true;
peertubeConfigurationResource = {
imports = [
commonResourceModule
../machines/operator/test05
];
};
pixelfedConfigurationResource = makeResourceModule {
vmName = "test04";
isTestVm = true;
pixelfedConfigurationResource = {
imports = [
commonResourceModule
../machines/operator/test04
];
};
};
@ -135,11 +117,12 @@ let
};
makeResourceConfig =
vm:
{ vmName, isTestVm }:
(evalModules {
modules = [
nixops4ResourceNixosMockOptions
(makeResourceModule vm)
commonResourceModule
(if isTestVm then ../machines/operator/${vmName} else ../machines/dev/${vmName})
];
}).config;

View file

@ -2,6 +2,7 @@
_class = "nixops4Resource";
fediversityVm = {
name = "fedi200";
vmId = 200;
proxmox = "fediversity";
description = "Testing machine for Hans";

View file

@ -2,6 +2,7 @@
_class = "nixops4Resource";
fediversityVm = {
name = "fedi201";
vmId = 201;
proxmox = "fediversity";
description = "FediPanel";

View file

@ -20,6 +20,7 @@ in
ssh.host = mkForce "forgejo-ci";
fediversityVm = {
name = "forgejo-ci";
domain = "procolix.com";
ipv4 = {

View file

@ -2,6 +2,7 @@
_class = "nixops4Resource";
fediversityVm = {
name = "vm02116";
vmId = 2116;
proxmox = "procolix";
description = "Forgejo";

View file

@ -2,6 +2,7 @@
_class = "nixops4Resource";
fediversityVm = {
name = "vm02187";
vmId = 2187;
proxmox = "procolix";
description = "Wiki";

View file

@ -2,6 +2,7 @@
_class = "nixops4Resource";
fediversityVm = {
name = "test01";
vmId = 7001;
proxmox = "fediversity";

View file

@ -2,6 +2,7 @@
_class = "nixops4Resource";
fediversityVm = {
name = "test02";
vmId = 7002;
proxmox = "fediversity";

View file

@ -2,6 +2,7 @@
_class = "nixops4Resource";
fediversityVm = {
name = "test03";
vmId = 7003;
proxmox = "fediversity";

View file

@ -2,6 +2,7 @@
_class = "nixops4Resource";
fediversityVm = {
name = "test04";
vmId = 7004;
proxmox = "fediversity";

View file

@ -2,6 +2,7 @@
_class = "nixops4Resource";
fediversityVm = {
name = "test05";
vmId = 7005;
proxmox = "fediversity";

View file

@ -2,6 +2,7 @@
_class = "nixops4Resource";
fediversityVm = {
name = "test06";
vmId = 7006;
proxmox = "fediversity";

View file

@ -2,6 +2,7 @@
_class = "nixops4Resource";
fediversityVm = {
name = "test11";
vmId = 7011;
proxmox = "fediversity";

View file

@ -2,6 +2,7 @@
_class = "nixops4Resource";
fediversityVm = {
name = "test12";
vmId = 7012;
proxmox = "fediversity";

View file

@ -2,6 +2,7 @@
_class = "nixops4Resource";
fediversityVm = {
name = "test13";
vmId = 7013;
proxmox = "fediversity";

View file

@ -2,6 +2,7 @@
_class = "nixops4Resource";
fediversityVm = {
name = "test14";
vmId = 7014;
proxmox = "fediversity";