From 2b6edc0d73bac2d771e2ac02d4bbe1b36d384c0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 3 Jun 2025 01:15:57 -0300 Subject: [PATCH 1/2] monolith: enable nix cache over ssh --- secrets/monolith/default.yaml | 5 +- system/gitlab-runner.nix | 138 +++++++++++++++++---------- system/gitlab-runner/nix-cache-end | 21 ++++ system/gitlab-runner/nix-cache-start | 18 ++++ system/monolith-gitlab-runner.nix | 10 +- 5 files changed, 139 insertions(+), 53 deletions(-) create mode 100755 system/gitlab-runner/nix-cache-end create mode 100755 system/gitlab-runner/nix-cache-start diff --git a/secrets/monolith/default.yaml b/secrets/monolith/default.yaml index 0dbc4ae..f2e12a9 100644 --- a/secrets/monolith/default.yaml +++ b/secrets/monolith/default.yaml @@ -5,6 +5,7 @@ gitlab-runners: thoreb-itinerario-nix: ENC[AES256_GCM,data:UdAAD0V895sFoEYR56sCG2LlpZugJ0K/nwkTygzWOnbTSmBRAcIQ8qVFPZGw+K+XMSLiCyio6Jp7k8AYP0K1VYm+6aEP3OkqR9FCLQTJgXo=,iv:UGUby50BYkn13OzItk6zZmxc5+SnbZZa4bebQHIow2A=,tag:LjDg3deWwdH2T71EtPo6jA==,type:str] docker-images-token: ENC[AES256_GCM,data:GGB/KSkjdAyhFKEspAh91ItbqEDf7K/LZSGSn+Jp7SxRfXpDzHIiMD8XJ9PTkGLeQGN4ug1i2nTYPS7d/P5OALWDU+1NPiV9nPdG0w7GERfu4g==,iv:6roabdOKX9xFMf0hWlECd73+943R+hFLos0e2dOpzns=,tag:LrASFc4DtN7aQ+3oOW/p/w==,type:str] wopus-gitlab-nix: ENC[AES256_GCM,data:asE7J0d58x9VfQFWc07f5T4s5NZ+/VqMQo66EX93J0LbJ4iI5YjvrrIE4pSI1e4Nz/SRQhltaJ0DfSH0+qgjD4wnAONPRi3UlFbSdGWS2bwwRtWe+Nci2krrUFxV2i/ZVE3CwCkNe4mqtII=,iv:gKrD/LhzI+jnDnX6CdxoHfjpiRdrsuRYJF9rTc8SffM=,tag:TczDGSU3gdKmERjBJ7tP/A==,type:str] + wopus-ssh-nix-cache-pk: ENC[AES256_GCM,data:MtYDK6P7nwBzr6p+lRX/dkosBfeDUAj/slf/a5SgVXNIbQlkEk7gvfW5iL+C2HgMwowqWx4F+3q2W+kGweqEYzEYAoZ9pR08a7Jci3Szyy49hkamxJXF+Qwhb5VQKxDppESne7DARCF0iYeUjgeXxCYyuWlGpisnkN3HCWrIYCqbk0LS+yqgkNhDxtxMaThGYztfPnLMEV/P5vuge9sRKu3Xi3iX2uDKtx4FTBsX30Lmd8kngOVnP/GaEHDa5ECO+/yW6ZRg3fIaqJ4RV+Vz79ovFUuZV/VE8eY3JOdK5tKIBWb31YUOjP7ccBes7mMhFLO3ceNeh+a6KAJbQ4pCojJwf/cLz663FKr5f/uWDicOBbL64l3+zV5zvSDzFls0ImXMNL6Fe3SaKP7ZcC5rVrRD8P+UN/OSFmbN5LM7uYY8nNsLxTH7MYsRHgTBUmTsFEhLGJIUjtf6J3/NWIlxjBq1MmpgxN0bD6gwVAxDPP489v918tsZtKdG8SJhLUPE4LWKsU7LHpgUBroKlbGE,iv:1jnF2TTlyTR59xM8Bgaz6bubDOwFexHBJipNVa0VPXY=,tag:VsDb6C6wYa9p4Yey3iG4eA==,type:str] sops: age: - recipient: age1zrgu7w8059xydagm60phnffghvfe9h2ca58cx8qwagqpyfuvs9fqw79c8h @@ -25,8 +26,8 @@ sops: aFVxcDFhaGdYekRWRVFIWnRsZndtZFkKgsvxOFHOcO306Z9FkucA1fDOpZA8N1/h jYmIgcKTFgWoSCvux67lK30jFsYp7sm5z6WxxDYsGcoQ/+pxoUX2jQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-06-24T11:51:22Z" - mac: ENC[AES256_GCM,data:onyjWlFsH/9YGSi2nGsPmZjhE4nFVQ5Jiwfi4s9KC7NetKD7Reyz2JY6i3YuZspBn3Jvbq8nOKVPGzttMAG+IrqQEv6+MxrCOEnJZXZcqocDNg7dACOXmJB5iwpFVdKscesTH2SScf7Pl/q6l9KOFjFuaZeBB7dlxHVA5zzCVOU=,iv:lEbxg2HfxU6ikgWSpUNAGIfgaz7DnZjXnLWcmsvt0A4=,tag:/Ag37QuJj9Xy/u20Nhy05Q==,type:str] + lastmodified: "2025-07-16T15:08:21Z" + mac: ENC[AES256_GCM,data:jGS7FqZqEeACNIoeSLokZFa8NdD4ItagH0MXDK/71VODxAHXyYx1YC1rjQoHtJ94wBJV+PAJBvsVXFLRpp9OrmSmHdEAxDAfk0/yQsbqpTyruYRC+bkf5V+Ul8DhtXLFlCQ0LVL+Ku9jTUGCUbV0MHLAN5OBfPglk2vICOoV8Qk=,iv:1HAG5eAoAscctpkYQ1BNUFfQAodb0KbMqgQMw9W6G3o=,tag:rpxbvG5l7eMvCTKYQeRtEw==,type:str] pgp: - created_at: "2025-03-07T22:49:16Z" enc: |- diff --git a/system/gitlab-runner.nix b/system/gitlab-runner.nix index 5650a52..602f3df 100644 --- a/system/gitlab-runner.nix +++ b/system/gitlab-runner.nix @@ -1,56 +1,96 @@ { pkgs, lib, ... }: let - installNixScript = pkgs.writeScriptBin "install-nix" '' - mkdir -p -m 0755 /nix/var/log/nix/drvs - mkdir -p -m 0755 /nix/var/nix/gcroots - mkdir -p -m 0755 /nix/var/nix/profiles - mkdir -p -m 0755 /nix/var/nix/temproots - mkdir -p -m 0755 /nix/var/nix/userpool - mkdir -p -m 1777 /nix/var/nix/gcroots/per-user - mkdir -p -m 1777 /nix/var/nix/profiles/per-user - mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root - mkdir -p -m 0700 "$HOME/.nix-defexpr" + installNixScript = + { + authenticationTokenConfigFile, + nixCacheSshPrivateKeyPath ? null, + ... + }: + pkgs.writeScriptBin "install-nix" '' + mkdir -p -m 0755 /nix/var/log/nix/drvs + mkdir -p -m 0755 /nix/var/nix/gcroots + mkdir -p -m 0755 /nix/var/nix/profiles + mkdir -p -m 0755 /nix/var/nix/temproots + mkdir -p -m 0755 /nix/var/nix/userpool + mkdir -p -m 1777 /nix/var/nix/gcroots/per-user + mkdir -p -m 1777 /nix/var/nix/profiles/per-user + mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root + mkdir -p -m 0700 "$HOME/.nix-defexpr" - . ${pkgs.nix}/etc/profile.d/nix.sh + . ${pkgs.nix}/etc/profile.d/nix.sh - ${pkgs.nix}/bin/nix-env -i ${ - lib.concatStringsSep " " ( - with pkgs; - [ - nix - cacert - git - openssh - docker - ] - ) - } - ''; + ${pkgs.nix}/bin/nix-env -i ${ + lib.concatStringsSep " " ( + with pkgs; + [ + nix + cacert + git + openssh + docker + ] + ) + } + + ${lib.optionalString (nixCacheSshPrivateKeyPath != null) '' + NIX_CACHE_SSH_PRIVATE_KEY_PATH="${nixCacheSshPrivateKeyPath}" + . ${./gitlab-runner/nix-cache-start} + ''} + ''; + + pushStoreContents = + { + authenticationTokenConfigFile, + nixCacheSshPrivateKeyPath ? null, + ... + }: + pkgs.writeScriptBin "push-to-cache" '' + ${lib.optionalString (nixCacheSshPrivateKeyPath != null) '' + . ${./gitlab-runner/nix-cache-end} + ''} + ''; in -{ - mkNixRunner = authenticationTokenConfigFile: { - # File should contain at least these two variables: - # `CI_SERVER_URL` - # `REGISTRATION_TOKEN` - inherit authenticationTokenConfigFile; # 2 - dockerImage = "alpine:3.18.2"; - dockerPullPolicy = "if-not-present"; - dockerVolumes = [ - "/etc/nix/nix.conf:/etc/nix/nix.conf:ro" - "/nix/store:/nix/store:ro" - "/nix/var/nix/db:/nix/var/nix/db:ro" - "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro" - "/tmp:/tmp" - "/var/run/docker.sock:/var/run/docker.sock" - "/var/lib/docker/containers:/var/lib/docker/containers" - ]; - dockerDisableCache = true; - preBuildScript = "\". ${lib.getExe installNixScript}\""; - environmentVariables = { - ENV = "/etc/profile"; - USER = "root"; - NIX_REMOTE = "daemon"; - NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"; +rec { + mkNixRunnerFull = + { + authenticationTokenConfigFile, + nixCacheSshPrivateKeyPath ? null, + ... + }@args: + { + # File should contain at least these two variables: + # `CI_SERVER_URL` + # `REGISTRATION_TOKEN` + inherit authenticationTokenConfigFile; # 2 + dockerImage = "alpine:3.18.2"; + dockerPullPolicy = "if-not-present"; + dockerVolumes = + [ + "/etc/nix/nix.conf:/etc/nix/nix.conf:ro" + "/nix/store:/nix/store:ro" + "/nix/var/nix/db:/nix/var/nix/db:ro" + "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro" + "/tmp:/tmp" + "/var/run/docker.sock:/var/run/docker.sock" + "/var/lib/docker/containers:/var/lib/docker/containers" + ] + ++ lib.optionals (nixCacheSshPrivateKeyPath != null) [ + "${nixCacheSshPrivateKeyPath}:${nixCacheSshPrivateKeyPath}" + ]; + dockerDisableCache = true; + preBuildScript = "\". ${lib.getExe (installNixScript args)}\""; + postBuildScript = "\". ${lib.getExe (pushStoreContents args)}\""; + environmentVariables = { + ENV = "/etc/profile"; + USER = "root"; + NIX_REMOTE = "daemon"; + NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"; + }; + }; + + mkNixRunner = + authenticationTokenConfigFile: + mkNixRunnerFull { + inherit authenticationTokenConfigFile; }; - }; } diff --git a/system/gitlab-runner/nix-cache-end b/system/gitlab-runner/nix-cache-end new file mode 100755 index 0000000..5275fc3 --- /dev/null +++ b/system/gitlab-runner/nix-cache-end @@ -0,0 +1,21 @@ +#!/bin/sh + +echo "nix-cache: Storing new store items" +NEW_NIX_STORE_CONTENTS_FILE=$(mktemp) +find /nix/store/ -maxdepth 1 > $NEW_NIX_STORE_CONTENTS_FILE + +sort $OLD_NIX_STORE_CONTENTS_FILE -o $OLD_NIX_STORE_CONTENTS_FILE +sort $NEW_NIX_STORE_CONTENTS_FILE -o $NEW_NIX_STORE_CONTENTS_FILE + +echo "nix-cache: Comparing store paths" +FILTERED_NIX_STORE_CONTENTS_FILE=$(mktemp) +comm -13 $OLD_NIX_STORE_CONTENTS_FILE $NEW_NIX_STORE_CONTENTS_FILE > $FILTERED_NIX_STORE_CONTENTS_FILE +echo "nix-cache: New store paths:" +cat $FILTERED_NIX_STORE_CONTENTS_FILE | sed 's/^/ /g' + +if test -n "$(head -n1 $FILTERED_NIX_STORE_CONTENTS_FILE)"; then + echo "nix-cache: Sending new paths to cache" + nix copy --to "$STORE_URL" $(cat $FILTERED_NIX_STORE_CONTENTS_FILE) || true +else + echo "nix-cache: Nothing to send" +fi diff --git a/system/gitlab-runner/nix-cache-start b/system/gitlab-runner/nix-cache-start new file mode 100755 index 0000000..38797d2 --- /dev/null +++ b/system/gitlab-runner/nix-cache-start @@ -0,0 +1,18 @@ +#!/bin/sh + +echo "nix-cache: Setting up ssh key and host" +STORE_HOST_PUB_KEY="IyBuaXgtY2FjaGUud29wdXMuZGV2OjIyIFNTSC0yLjAtT3BlblNTSF8xMC4wCm5peC1jYWNoZS53b3B1cy5kZXYgc3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSU5VNzFONVF4ZENtTTdOMjVTbk9nNnUrWUxtdjkyem5wZURjeUlEYW1sZEkK" +STORE_URL="ssh://nix-ssh@nix-cache.wopus.dev?trusted=true&compress=true&ssh-key=$NIX_CACHE_SSH_PRIVATE_KEY_PATH&base64-ssh-public-host-key=$STORE_HOST_PUB_KEY" +echo STORE_URL="$STORE_URL" + +NIX_EXTRA_CONFIG_FILE=$(mktemp) +cat > "$NIX_EXTRA_CONFIG_FILE" < $OLD_NIX_STORE_CONTENTS_FILE diff --git a/system/monolith-gitlab-runner.nix b/system/monolith-gitlab-runner.nix index 023dc66..db493fb 100644 --- a/system/monolith-gitlab-runner.nix +++ b/system/monolith-gitlab-runner.nix @@ -4,7 +4,7 @@ ... }: let - inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner; + inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner mkNixRunnerFull; in { boot.kernel.sysctl."net.ipv4.ip_forward" = true; @@ -18,7 +18,10 @@ in thoreb-telemetria-nix = mkNixRunner config.sops.secrets."gitlab-runners/thoreb-telemetria-nix".path; thoreb-itinerario-nix = mkNixRunner config.sops.secrets."gitlab-runners/thoreb-itinerario-nix".path; - wopus-gitlab-nix = mkNixRunner config.sops.secrets."gitlab-runners/wopus-gitlab-nix".path; + wopus-gitlab-nix = mkNixRunnerFull { + authenticationTokenConfigFile = config.sops.secrets."gitlab-runners/wopus-gitlab-nix".path; + nixCacheSshPrivateKeyPath = config.sops.secrets."gitlab-runners/wopus-ssh-nix-cache-pk".path; + }; default = { # File should contain at least these two variables: @@ -45,5 +48,8 @@ in "gitlab-runners/wopus-gitlab-nix" = { sopsFile = ../secrets/monolith/default.yaml; }; + "gitlab-runners/wopus-ssh-nix-cache-pk" = { + sopsFile = ../secrets/monolith/default.yaml; + }; }; } From 734a94fa8d0937453dd8e31be5de46db5f554099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 3 Jun 2025 12:56:29 -0300 Subject: [PATCH 2/2] update nix ssh cache --- system/gitlab-runner.nix | 18 +++-------- system/gitlab-runner/nix-cache-end | 21 ------------- system/gitlab-runner/nix-cache-start | 45 +++++++++++++++++++++++----- 3 files changed, 42 insertions(+), 42 deletions(-) delete mode 100755 system/gitlab-runner/nix-cache-end diff --git a/system/gitlab-runner.nix b/system/gitlab-runner.nix index 602f3df..543071b 100644 --- a/system/gitlab-runner.nix +++ b/system/gitlab-runner.nix @@ -34,21 +34,11 @@ let ${lib.optionalString (nixCacheSshPrivateKeyPath != null) '' NIX_CACHE_SSH_PRIVATE_KEY_PATH="${nixCacheSshPrivateKeyPath}" + NIX_CACHE_SSH_PUBLIC_KEY="# nix-cache.wopus.dev:22 SSH-2.0-OpenSSH_10.0 + nix-cache.wopus.dev ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINU71N5QxdCmM7N25SnOg6u+YLmv92znpeDcyIDamldI" . ${./gitlab-runner/nix-cache-start} ''} ''; - - pushStoreContents = - { - authenticationTokenConfigFile, - nixCacheSshPrivateKeyPath ? null, - ... - }: - pkgs.writeScriptBin "push-to-cache" '' - ${lib.optionalString (nixCacheSshPrivateKeyPath != null) '' - . ${./gitlab-runner/nix-cache-end} - ''} - ''; in rec { mkNixRunnerFull = @@ -73,13 +63,13 @@ rec { "/tmp:/tmp" "/var/run/docker.sock:/var/run/docker.sock" "/var/lib/docker/containers:/var/lib/docker/containers" + "/cache" ] ++ lib.optionals (nixCacheSshPrivateKeyPath != null) [ "${nixCacheSshPrivateKeyPath}:${nixCacheSshPrivateKeyPath}" ]; - dockerDisableCache = true; + # dockerDisableCache = true; preBuildScript = "\". ${lib.getExe (installNixScript args)}\""; - postBuildScript = "\". ${lib.getExe (pushStoreContents args)}\""; environmentVariables = { ENV = "/etc/profile"; USER = "root"; diff --git a/system/gitlab-runner/nix-cache-end b/system/gitlab-runner/nix-cache-end deleted file mode 100755 index 5275fc3..0000000 --- a/system/gitlab-runner/nix-cache-end +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -echo "nix-cache: Storing new store items" -NEW_NIX_STORE_CONTENTS_FILE=$(mktemp) -find /nix/store/ -maxdepth 1 > $NEW_NIX_STORE_CONTENTS_FILE - -sort $OLD_NIX_STORE_CONTENTS_FILE -o $OLD_NIX_STORE_CONTENTS_FILE -sort $NEW_NIX_STORE_CONTENTS_FILE -o $NEW_NIX_STORE_CONTENTS_FILE - -echo "nix-cache: Comparing store paths" -FILTERED_NIX_STORE_CONTENTS_FILE=$(mktemp) -comm -13 $OLD_NIX_STORE_CONTENTS_FILE $NEW_NIX_STORE_CONTENTS_FILE > $FILTERED_NIX_STORE_CONTENTS_FILE -echo "nix-cache: New store paths:" -cat $FILTERED_NIX_STORE_CONTENTS_FILE | sed 's/^/ /g' - -if test -n "$(head -n1 $FILTERED_NIX_STORE_CONTENTS_FILE)"; then - echo "nix-cache: Sending new paths to cache" - nix copy --to "$STORE_URL" $(cat $FILTERED_NIX_STORE_CONTENTS_FILE) || true -else - echo "nix-cache: Nothing to send" -fi diff --git a/system/gitlab-runner/nix-cache-start b/system/gitlab-runner/nix-cache-start index 38797d2..0fe9d4f 100755 --- a/system/gitlab-runner/nix-cache-start +++ b/system/gitlab-runner/nix-cache-start @@ -1,18 +1,49 @@ #!/bin/sh -echo "nix-cache: Setting up ssh key and host" -STORE_HOST_PUB_KEY="IyBuaXgtY2FjaGUud29wdXMuZGV2OjIyIFNTSC0yLjAtT3BlblNTSF8xMC4wCm5peC1jYWNoZS53b3B1cy5kZXYgc3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSU5VNzFONVF4ZENtTTdOMjVTbk9nNnUrWUxtdjkyem5wZURjeUlEYW1sZEkK" +echo "nix-cache: Setting up ssh key and host" >&2 +STORE_HOST_PUB_KEY="$(echo "$NIX_CACHE_SSH_PUBLIC_KEY" | base64 | tr -d '\n')" STORE_URL="ssh://nix-ssh@nix-cache.wopus.dev?trusted=true&compress=true&ssh-key=$NIX_CACHE_SSH_PRIVATE_KEY_PATH&base64-ssh-public-host-key=$STORE_HOST_PUB_KEY" -echo STORE_URL="$STORE_URL" +echo STORE_URL="$STORE_URL" >&2 NIX_EXTRA_CONFIG_FILE=$(mktemp) cat > "$NIX_EXTRA_CONFIG_FILE" <&2 export NIX_USER_CONF_FILES="$NIX_EXTRA_CONFIG_FILE:$NIX_USER_CONF_FILES" -echo "nix-cache: Storing existing store items" -OLD_NIX_STORE_CONTENTS_FILE=$(mktemp) -find /nix/store/ -maxdepth 1 > $OLD_NIX_STORE_CONTENTS_FILE +echo "nix-cache: Setting up nix hook" >&2 +nix() { + echo "nix-cache: executing nix hook" >&2 + command nix "$@" + local STATUS="$?" + + local BUILD=no + if test "$STATUS" = "0"; then + for arg in "$@"; do + echo "nix-cache: evaluating arg '$arg'" >&2 + case "$arg" in + build) + echo "nix-cache: enablig upload" >&2 + BUILD=yes + ;; + -*) + echo "nix-cache: ignoring argument '$arg'" >&2 + ;; + *) + if test "$BUILD" = yes; then + echo "nix-cache: Sending path $arg" >&2 + command nix copy --to "$STORE_URL" "$arg" || true + else + echo "nix-cache: not building, ignoring argument '$arg'" >&2 + fi + ;; + esac + done + else + echo "nix-cache: nix exited with code '$STATUS', ignoring" >&2 + fi + + return "$STATUS" +}