kiara/Fediversity
1
0
Fork 0
forked from fediversity/fediversity
Code Pull requests Activity

continued

Browse source 
Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>
This commit is contained in:
Kiara Grouwstra 2025-09-18 18:26:52 +02:00
parent e23f125e87
commit fae99afaea
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
5 changed files with 138 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
deployment/check/common/data-model.nix
View file

@ -5,6 +5,7 @@
sources ? import ../../../npins, sources ? import ../../../npins,
... ...
}@args: }@args:
# FIXME allow default values for `config` module parameters?
let let
# having this module's location (`self`) and (serializable) `args`, we know # having this module's location (`self`) and (serializable) `args`, we know
@ -25,8 +26,8 @@ let
sshOpts sshOpts
proxmox-user proxmox-user
proxmox-password proxmox-password
node-name
; ;
node-name = nodeName;
inherit (lib) mkOption types; inherit (lib) mkOption types;
eval = eval =
module: module:

128
deployment/check/data-model-tf-proxmox/nixosTest.nix
View file

@ -12,14 +12,15 @@ let
nodeName = "mypve"; nodeName = "mypve";
targetSystem = system; targetSystem = system;
sshOpts = [ ]; sshOpts = [ ];
proxmox-user = "root@pam";
proxmox-password = "mytestpw";
node-name = "";
}; };
# FIXME generate the image `nixos-generate` was to make, but now do it for a desired `-c configuration.nix` rather than whatever generic thing now
deployment = deployment =
(import ../common/data-model.nix { (import ../common/data-model.nix {
inherit system; inherit system;
config = deployment-config; config = deployment-config;
proxmox-username = "root@pam";
proxmox-password = "mytestpw";
node-name = "";
# opt not to pass `inputs`, as we could only pass serializable arguments through to its self-call # opt not to pass `inputs`, as we could only pass serializable arguments through to its self-call
})."tf-proxmox-deployment".tf-proxmox-host; })."tf-proxmox-deployment".tf-proxmox-host;
# tracking non-tarball downloads seems unsupported still in npins: # tracking non-tarball downloads seems unsupported still in npins:
@ -28,13 +29,27 @@ let
url = "https://releases.nixos.org/nixos/24.05/nixos-24.05.7139.bcba2fbf6963/nixos-minimal-24.05.7139.bcba2fbf6963-x86_64-linux.iso"; url = "https://releases.nixos.org/nixos/24.05/nixos-24.05.7139.bcba2fbf6963/nixos-minimal-24.05.7139.bcba2fbf6963-x86_64-linux.iso";
hash = "sha256-plre/mIHdIgU4xWU+9xErP+L4i460ZbcKq8iy2n4HT8="; hash = "sha256-plre/mIHdIgU4xWU+9xErP+L4i460ZbcKq8iy2n4HT8=";
}; };
# machine =
# (import "${pkgs.nixos-generators}/share/nixos-generator/nixos-generate.nix" {
# inherit system;
# inherit (sources) nixpkgs;
# formatConfig = "${pkgs.nixos-generators}/share/nixos-generator/formats/proxmox.nix";
# configuration = deployment.nixos-configuration; # /nix/store/9nl9q95lvhbr86ys0q2xakr844cg9vym-nixos-generators-1.8.0/share/nixos-generator/configuration.nix
# }).config;
# .config.system.build.toplevel.drvPath
gen = import "${pkgs.nixos-generators}/share/nixos-generator/nixos-generate.nix" {
inherit system;
inherit (sources) nixpkgs;
formatConfig = "${pkgs.nixos-generators}/share/nixos-generator/formats/proxmox.nix";
configuration = deployment.nixos-configuration;
};
machine = machine =
(import "${pkgs.nixos-generators}/share/nixos-generator/nixos-generate.nix" { # lib.trace ".config: ${builtins.toString (lib.attrNames gen.config)}"
inherit system; # lib.trace ".config.system: ${builtins.toString (lib.attrNames gen.config.system)}"
inherit (sources) nixpkgs; # lib.trace ".config.system.build: ${builtins.toString (lib.attrNames gen.config.system.build)}"
formatConfig = "${pkgs.nixos-generators}/share/nixos-generator/formats/proxmox.nix"; # lib.trace ".config.system.build.toplevel: ${builtins.toString (lib.attrNames gen.config.system.build.toplevel)}"
configuration = deployment.nixos-configuration; # lib.trace ".config.system.build.toplevel.drvPath: ${builtins.toString (lib.attrNames gen.config.system.build.toplevel.drvPath)}"
}).config; gen.config;
in in
{ {
_class = "nixosTest"; _class = "nixosTest";
@ -132,69 +147,40 @@ in
lib.trace "no" [ ] lib.trace "no" [ ]
) )
) machine.environment.systemPackages) ) machine.environment.systemPackages)
# ++ (let
# base =
# (import "${pkgs.nixos-generators}/share/nixos-generator/nixos-generate.nix" {
# inherit system;
# inherit (sources) nixpkgs;
# formatConfig = "${pkgs.nixos-generators}/share/nixos-generator/formats/proxmox.nix";
# configuration = "${pkgs.nixos-generators}/share/nixos-generator/configuration.nix";
# }).config;
# in [
# base.system.build.toplevel.inputDerivation
# base.system.build.etc.inputDerivation
# base.system.build.etcBasedir.inputDerivation
# base.system.build.etcMetadataImage.inputDerivation
# base.system.build.extraUtils.inputDerivation
# base.system.path.inputDerivation
# base.system.build.setEnvironment.inputDerivation
# base.system.build.vm.inputDerivation
# base.system.build.bootStage1.inputDerivation
# base.system.build.bootStage2.inputDerivation
# ])
++ [ ++ [
( # )
( # (
x: # (x: builtins.trace "machine.system.build.vm.inputDerivation: ${builtins.toString (lib.isPath x)}" x)
builtins.trace "machine.system.build.toplevel.inputDerivation: ${builtins.toString (lib.isPath x)}" x machine.system.build.toplevel.inputDerivation
) machine.system.build.etc.inputDerivation
machine.system.build.toplevel.inputDerivation machine.system.build.etcBasedir.inputDerivation
) machine.system.build.etcMetadataImage.inputDerivation
( machine.system.build.extraUtils.inputDerivation
( machine.system.path.inputDerivation
x: builtins.trace "machine.system.build.etc.inputDerivation: ${builtins.toString (lib.isPath x)}" x machine.system.build.setEnvironment.inputDerivation
) machine.system.build.vm.inputDerivation
machine.system.build.etc.inputDerivation machine.system.build.bootStage1.inputDerivation
) machine.system.build.bootStage2.inputDerivation
(
(
x:
builtins.trace "machine.system.build.etcBasedir.inputDerivation: ${builtins.toString (lib.isPath x)}" x
)
machine.system.build.etcBasedir.inputDerivation
)
(
(
x:
builtins.trace "machine.system.build.etcMetadataImage.inputDerivation: ${builtins.toString (lib.isPath x)}" x
)
machine.system.build.etcMetadataImage.inputDerivation
)
(
(
x:
builtins.trace "machine.system.build.extraUtils.inputDerivation: ${builtins.toString (lib.isPath x)}" x
)
machine.system.build.extraUtils.inputDerivation
)
((x: builtins.trace "machine.system.path.inputDerivation: ${builtins.toString (lib.isPath x)}" x)
machine.system.path.inputDerivation
)
(
(
x:
builtins.trace "machine.system.build.setEnvironment.inputDerivation: ${builtins.toString (lib.isPath x)}" x
)
machine.system.build.setEnvironment.inputDerivation
)
(
(x: builtins.trace "machine.system.build.vm.inputDerivation: ${builtins.toString (lib.isPath x)}" x)
machine.system.build.vm.inputDerivation
)
(
(
x:
builtins.trace "machine.system.build.bootStage1.inputDerivation: ${builtins.toString (lib.isPath x)}" x
)
machine.system.build.bootStage1.inputDerivation
)
(
(
x:
builtins.trace "machine.system.build.bootStage2.inputDerivation: ${builtins.toString (lib.isPath x)}" x
)
machine.system.build.bootStage2.inputDerivation
)
pkgs.gnu-config pkgs.gnu-config
# pkgs.gnu-config.inputDerivation # pkgs.gnu-config.inputDerivation
pkgs.byacc pkgs.byacc

48
deployment/data-model.nix
View file

@ -317,6 +317,19 @@ let
description = "the name of the ProxmoX node to use."; description = "the name of the ProxmoX node to use.";
type = types.str; type = types.str;
}; };
# nixos-conf = mkOption {
# type = types.str;
# default = writeConfig {
# inherit (tf-host.config)
# system
# module
# args
# deployment-name
# root-path
# ;
# deployment-type = "tf-proxmox-host";
# };
# };
run = mkOption { run = mkOption {
type = types.package; type = types.package;
# error: The option `tf-deployment.tf-host.run' is read-only, but it's set multiple times. # error: The option `tf-deployment.tf-host.run' is read-only, but it's set multiple times.
@ -333,6 +346,7 @@ let
proxmox-user proxmox-user
proxmox-password proxmox-password
node-name node-name
# nixos-conf
; ;
inherit (ssh) inherit (ssh)
host host
@ -342,36 +356,34 @@ let
; ;
environment = { environment = {
key_file = key-file; key_file = key-file;
deployment_name = deployment-name;
root_path = root-path;
ssh_opts = sshOpts; ssh_opts = sshOpts;
inherit inherit
system
host host
module
args
; ;
proxmox_user = proxmox-user; proxmox_user = proxmox-user;
proxmox_password = proxmox-password; proxmox_password = proxmox-password;
deployment_type = "tf-proxmox-host";
ssh_user = username; ssh_user = username;
node_name = node-name; node_name = node-name;
# nixos_conf = nixos-conf;
nixos_conf = writeConfig {
inherit
system
module
args
deployment-name
root-path
;
deployment-type = "tf-proxmox-host";
};
}; };
tf-env = pkgs.callPackage ./run/tf-proxmox/tf-env.nix { }; tf-env = pkgs.callPackage ./run/tf-proxmox/tf-env.nix { };
in in
pkgs.writers.writeBashBin "deploy-tf-proxmox.sh" pkgs.writers.writeBashBin "deploy-tf-proxmox.sh"
{ (withPackages [
makeWrapperArgs = [ pkgs.jq
"--prefix" pkgs.nixos-generators
"PATH" (pkgs.callPackage ./run/tf-proxmox/tf.nix { inherit sources; })
":" ])
"${lib.makeBinPath [
pkgs.jq
pkgs.nixos-generators
(pkgs.callPackage ./run/tf-proxmox/tf.nix { inherit sources; })
]}"
];
}
'' ''
env ${toString (lib.mapAttrsToList (k: v: "TF_VAR_${k}=\"${toBash v}\"") environment)} \ env ${toString (lib.mapAttrsToList (k: v: "TF_VAR_${k}=\"${toBash v}\"") environment)} \
tf_env=${tf-env} bash ./deployment/run/tf-proxmox/run.sh tf_env=${tf-env} bash ./deployment/run/tf-proxmox/run.sh

94
deployment/run/tf-proxmox/main.tf
View file

@ -7,9 +7,9 @@ terraform {
} }
} }
locals { # locals {
dump_name = "vzdump-qemu-nixos-fediversity-${var.category}.vma.zst" # dump_name = "vzdump-qemu-nixos-fediversity-${var.category}.vma.zst"
} # }
provider "proxmox" { provider "proxmox" {
endpoint = "https://${var.host}:8006/" endpoint = "https://${var.host}:8006/"
@ -29,57 +29,57 @@ provider "proxmox" {
# csrf_prevention_token = var.virtual_environment_csrf_prevention_token # csrf_prevention_token = var.virtual_environment_csrf_prevention_token
} }
# FIXME move to host # # FIXME move to host
# FIXME add proxmox # # FIXME add proxmox
data "external" "base-hash" { # data "external" "base-hash" {
program = ["sh", "-c", "echo \"{\\\"hash\\\":\\\"$(nix-hash ${path.module}/../common/nixos/base.nix)\\\"}\""] # program = ["sh", "-c", "echo \"{\\\"hash\\\":\\\"$(nix-hash ${path.module}/../common/nixos/base.nix)\\\"}\""]
} # }
# hash of our code directory, used to trigger re-deploy # # hash of our code directory, used to trigger re-deploy
# FIXME calculate separately to reduce false positives # # FIXME calculate separately to reduce false positives
data "external" "hash" { # data "external" "hash" {
program = ["sh", "-c", "echo \"{\\\"hash\\\":\\\"$(nix-hash ..)\\\"}\""] # program = ["sh", "-c", "echo \"{\\\"hash\\\":\\\"$(nix-hash ..)\\\"}\""]
} # }
# FIXME move to host # # FIXME move to host
resource "terraform_data" "template" { # resource "terraform_data" "template" {
# triggers_replace = [ # # triggers_replace = [
# data.external.base-hash.result, # # data.external.base-hash.result,
# ] # # ]
provisioner "local-exec" { # provisioner "local-exec" {
working_dir = path.root # working_dir = path.root
# FIXME configure to use actual base image # # FIXME configure to use actual base image
command = <<-EOF # command = <<-EOF
set -xeuo pipefail # set -xeuo pipefail
# XXX nixos-generate needs NIX_PATH to have `nixpkgs` set! # # XXX nixos-generate needs NIX_PATH to have `nixpkgs` set!
nixos-generate -f proxmox -o /tmp/nixos-image # nixos-generate -f proxmox -o /tmp/nixos-image
# the above makes /tmp/nixos-image read-only, so our stable file name needs a different directory # # the above makes /tmp/nixos-image read-only, so our stable file name needs a different directory
mkdir -p /tmp/proxmox-image # mkdir -p /tmp/proxmox-image
ln -sf /tmp/nixos-image/vzdump-qemu-nixos-*.vma.zst /tmp/proxmox-image/${local.dump_name} # ln -sf /tmp/nixos-image/vzdump-qemu-nixos-*.vma.zst /tmp/proxmox-image/${local.dump_name}
EOF # EOF
} # }
} # }
# FIXME move to host # # FIXME move to host
resource "proxmox_virtual_environment_file" "upload" { # resource "proxmox_virtual_environment_file" "upload" {
lifecycle { # lifecycle {
replace_triggered_by = [ # replace_triggered_by = [
terraform_data.template, # terraform_data.template,
] # ]
} # }
content_type = "images" # content_type = "images"
datastore_id = "local" # datastore_id = "local"
node_name = var.node_name # node_name = var.node_name
overwrite = true # overwrite = true
source_file { # source_file {
path = "/tmp/proxmox-image/${local.dump_name}" # path = "/tmp/proxmox-image/${local.dump_name}"
file_name = local.dump_name # file_name = local.dump_name
} # }
} # }
# FIXME distinguish var.category # FIXME distinguish var.category
data "proxmox_virtual_environment_vms" "nixos_base" { data "proxmox_virtual_environment_vms" "nixos_base" {

32
deployment/run/tf-proxmox/variables.tf
View file

@ -1,7 +1,6 @@
variable "system" { variable "nixos_conf" {
description = "The architecture of the system to deploy to." description = "The path to the NixOS configuration to deploy."
type = string type = string
default = "x86_64-linux"
} }
variable "ssh_user" { variable "ssh_user" {
@ -32,44 +31,17 @@ variable "node_name" {
type = string type = string
} }
variable "module" {
description = "The module to call to obtain the NixOS configuration from."
type = string
}
variable "args" {
description = "The arguments with which to call the module to obtain the NixOS configuration."
type = string
default = "{}"
}
variable "key_file" { variable "key_file" {
description = "path to the user's SSH private key" description = "path to the user's SSH private key"
type = string type = string
} }
variable "deployment_name" {
description = "The name of the deployment for which to obtain the NixOS configuration."
type = string
}
variable "root_path" {
description = "The path to the root of the repository."
type = string
}
variable "ssh_opts" { variable "ssh_opts" {
description = "Extra SSH options (`-o`) to use." description = "Extra SSH options (`-o`) to use."
type = string type = string
default = "[]" default = "[]"
} }
variable "deployment_type" {
description = "A `deployment-type` from the Fediversity data model, for grabbing the desired NixOS configuration."
type = string
default = "tf-proxmox-host"
}
######################################### #########################################
variable "category" { variable "category" {