From fb4c2ef55aef8191a6ed378d11c4ae1ad9480336 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 29 Nov 2022 15:41:35 +0100 Subject: [PATCH] Remove old nomad-driver-nix --- .../staging/app/garage/deploy/garage-nix.hcl | 218 ------------------ .../{garage.hcl => old-garage-docker.hcl} | 0 cluster/staging/cluster.nix | 19 +- deploy_nixos | 1 - nix/nomad-driver-nix.nix | 31 --- 5 files changed, 4 insertions(+), 265 deletions(-) delete mode 100644 cluster/staging/app/garage/deploy/garage-nix.hcl rename cluster/staging/app/garage/deploy/{garage.hcl => old-garage-docker.hcl} (100%) delete mode 100644 nix/nomad-driver-nix.nix diff --git a/cluster/staging/app/garage/deploy/garage-nix.hcl b/cluster/staging/app/garage/deploy/garage-nix.hcl deleted file mode 100644 index 373fd10..0000000 --- a/cluster/staging/app/garage/deploy/garage-nix.hcl +++ /dev/null @@ -1,218 +0,0 @@ -job "garage-staging" { - type = "system" - #datacenters = [ "neptune", "pluton" ] - datacenters = [ "neptune" ] - - priority = 80 - - constraint { - attribute = "${attr.cpu.arch}" - value = "amd64" - } - - group "garage-staging" { - network { - port "s3" { static = 3990 } - port "rpc" { static = 3991 } - port "web" { static = 3992 } - port "k2v" { static = 3993 } - port "admin" { static = 3909 } - } - - update { - max_parallel = 1 - min_healthy_time = "30s" - healthy_deadline = "5m" - } - - # task "repair" { - # lifecycle { - # hook = "prestart" - # sidecar = false - # } - - # driver = "docker" - - # config { - # image = "dxflrs/amd64_garage:v0.7.99-k2v" - # command = "/garage" - # args = [ "offline-repair", "--yes", "object_counters" ] - # network_mode = "host" - # volumes = [ - # "/mnt/storage/garage-staging/data:/data", - # "/mnt/ssd/garage-staging/meta:/meta", - # "secrets/garage.toml:/etc/garage.toml", - # ] - # } - - # template { - # data = file("../config/garage.toml") - # destination = "secrets/garage.toml" - # } - - # resources { - # memory = 2000 - # cpu = 1000 - # } - # } - - task "server" { - driver = "nix" - - config { - packages = [ - "git+https://git.deuxfleurs.fr/Deuxfleurs/garage.git?ref=nix-remove-system&rev=60c26fbc628d7b450ae39214b578ab6a30583d5c" - ] - command = [ "/bin/garage", "server" ] - bind = { - "/mnt/storage/garage-staging/data" = "/data", - "/mnt/ssd/garage-staging/meta" = "/meta", - } - } - - template { - data = file("../config/garage.toml") - destination = "etc/garage.toml" - } - - template { - data = "{{ key \"secrets/consul/consul-ca.crt\" }}" - destination = "etc/garage/consul-ca.crt" - } - - template { - data = "{{ key \"secrets/consul/consul-client.crt\" }}" - destination = "etc/garage/consul-client.crt" - } - - template { - data = "{{ key \"secrets/consul/consul-client.key\" }}" - destination = "etc/garage/consul-client.key" - } - - template { - data = < {} -}: -pkgs.buildGoModule rec { - pname = "nomad-driver-nix"; - version = "0.1.0"; - - src = pkgs.fetchFromGitHub { - owner = "input-output-hk"; - repo = "nomad-driver-nix"; - rev = "010b09c680887d0cade86e8ac136c3a04609e04a"; - sha256 = "sha256-hET+b7XhDLSuVQwXLI2V5nYCcdvxQQj9BAG8z4ta6CE="; - }; - - vendorSha256 = "sha256-FDJpbNtcFEHnZvWip2pvUHF3BFyfcSohrr/3nk9YS24="; - - ldflags = [ - "-X github.com/input-output-hk/nomad-driver-nix/nix.pluginVersion=${version}" - ]; - - postInstall = '' - mv $out/bin/nomad-driver-nix $out/bin/nix-driver - ''; - - meta = with pkgs.lib; { - description = "Nomad driver to run Nix packages / NixOS in systemd-nspawn containers"; - homepage = "https://github.com/input-output-hk/nomad-driver-nix"; - license = licenses.mpl20; - platforms = platforms.linux; - }; -}