Merge pull request #129 from holochain/x86_64-linux-dev-01

introduce x64-linux-dev-01
holochain · Jun 19, 2024 · 846d457 · 846d457
2 parents 6371568 + 62bc8c6
commit 846d457
Show file tree

Hide file tree

Showing 11 changed files with 87 additions and 30 deletions.
diff --git a/.sops.yaml b/.sops.yaml
@@ -8,7 +8,7 @@ keys:
   - &jost-s D299483493EAE6B2B3D892B6D33548FA55FF167F
   - &dweb-reverse-proxy age1ygzy9clj0xavlmau0ham7j5nw8yy4z0q8hvkfpdgwc4fcr8nufpqrdxgvx
   - &linux-builder-01 age1kxkr407jz77ljrhgsfwfmv2yvqjprc6unvx389xp2f48xj8r0vqq2wew5r
-  - &linux-builder-02 age1vlxerq9j9jd00qvxj2gxds9re4dz2djqmllkhzsf44gz9a5y4ghs7807h9
+  - &x64-linux-dev-01 age1vlxerq9j9jd00qvxj2gxds9re4dz2djqmllkhzsf44gz9a5y4ghs7807h9
   - &tfgrid-shared age194xfar0gfdauu2dcxwqk9lh9d0vjfrzzs2ke0ppanpwv9eqxzs2qp7q7cn
 
 creation_rules:
@@ -26,10 +26,6 @@ creation_rules:
     key_groups:
     - age:
       - *linux-builder-01
-  - path_regex: ^secrets/linux-builder-02/[^/]+$
-    key_groups:
-    - age:
-      - *linux-builder-02
   - path_regex: ^secrets/nomad/.+$
     key_groups:
     - pgp:

diff --git a/modules/flake-parts/darwinConfigurations.macos-04/README.md b/modules/flake-parts/darwinConfigurations.macos-04/README.md
@@ -11,5 +11,4 @@ nix run .#ssh-macos-04
 exit
 nix run .\#deploy-macos-04
 nix run .\#linux-builder-01-ping-buildmachines
-nix run .\#linux-builder-02-ping-buildmachines
 ```
diff --git a/modules/flake-parts/nixosConfigurations.dweb-reverse-tls-proxy/configuration.nix b/modules/flake-parts/nixosConfigurations.dweb-reverse-tls-proxy/configuration.nix
@@ -184,6 +184,7 @@ in {
       amsterdam2023.events.${fqdn2domain}.     A       10.1.3.187
 
       sj-bm-hostkey0.dev.${fqdn2domain}.       A       185.130.224.33
+      x64-linux-dev-01.dev.${fqdn2domain}.    A       ${self.nixosConfigurations.x64-linux-dev-01.config.hostName}
 
       turn-0.${fqdn2domain}.                     A       ${self.nixosConfigurations.turn-0.config.services.holochain-turn-server.address}
       signal-0.${fqdn2domain}.                   A       ${self.nixosConfigurations.turn-0.config.services.tx5-signal-server.address}

diff --git a/...ations.linux-builder-02/configuration.nix → ...ations.x64-linux-dev-01/configuration.nix b/...ations.linux-builder-02/configuration.nix → ...ations.x64-linux-dev-01/configuration.nix
@@ -12,14 +12,6 @@
     inputs.srvos.nixosModules.hardware-hetzner-online-amd
     inputs.srvos.nixosModules.roles-nix-remote-builder
     self.nixosModules.holo-users
-    self.nixosModules.github-runner-multi-arch
-    {
-      config.services.github-runner-multi-arch = {
-        # can't distribute jobs to the mac builders so this would disturb CI jobs.
-        enable = false;
-        countOffset = config.services.github-runner-multi-arch.count;
-      };
-    }
 
     self.nixosModules.nix-build-distributor
 
@@ -30,16 +22,40 @@
     ../../nixos/shared-linux.nix
   ];
 
-  networking.hostName = "linux-builder-02"; # Define your hostname.
+  networking = {
+    hostName = "x64-linux-dev-01"; # Define your hostname.
+    useNetworkd = true;
+
+    nat.enable = true;
+    firewall.enable = true;
+
+    firewall.allowedTCPPorts = [
+      5201
+    ];
+    firewall.allowedUDPPorts = [
+      5201
+    ];
+  };
+
+  boot = {
+    kernel = {
+      sysctl = {
+        "net.ipv4.conf.all.forwarding" = true;
+        "net.ipv6.conf.all.forwarding" = true;
+      };
+    };
+  };
 
   hostName = "135.181.118.162";
 
   nix.settings.max-jobs = 32;
 
   roles.nix-remote-builder.schedulerPublicKeys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHVxIpF1Rfqz6i8JfhYswzYUM9cuL5p11LfVGSfPmw4Q root@github-runner-host"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINQ22z5rDdCLYH+MEoEt+tXJXTJqoeZNqvJl2n4aB+Kn steveej@steveej-x13s"
   ];
 
+  virtualisation.libvirtd.enable = true;
+
   boot.loader.grub = {
     efiSupport = false;
   };
@@ -81,10 +97,5 @@
     };
   };
 
-  sops.secrets.github-runners-token = {
-    key = "gh_hra2_pat4";
-    sopsFile = ../../../secrets/${config.networking.hostName}/secrets.yaml;
-  };
-
   system.stateVersion = "23.11";
 }
diff --git a/...nfigurations.linux-builder-02/default.nix → ...nfigurations.x64-linux-dev-01/default.nix b/...nfigurations.linux-builder-02/default.nix → ...nfigurations.x64-linux-dev-01/default.nix
@@ -4,7 +4,7 @@
   inputs,
   ...
 }: {
-  flake.nixosConfigurations.linux-builder-02 = inputs.nixpkgs.lib.nixosSystem {
+  flake.nixosConfigurations.x64-linux-dev-01 = inputs.nixpkgs.lib.nixosSystem {
     modules = [./configuration.nix];
     system = "x86_64-linux";
     specialArgs = self.specialArgs;

diff --git a/modules/flake-parts/packages.default.nix b/modules/flake-parts/packages.default.nix
@@ -57,7 +57,6 @@
       };
 
       linux-builder-01-ping-buildmachines = mkPingBuildmachines {builderName = "linux-builder-01";};
-      linux-builder-02-ping-buildmachines = mkPingBuildmachines {builderName = "linux-builder-02";};
     };
   };
 

diff --git a/pulumi-state/.pulumi/stacks/holochain-infra/dev.json b/pulumi-state/.pulumi/stacks/holochain-infra/dev.json
@@ -1,6 +1,19 @@
 {
     "version": 3,
     "checkpoint": {
-        "stack": "organization/holochain-infra/dev"
+        "stack": "organization/holochain-infra/dev",
+        "latest": {
+            "manifest": {
+                "time": "2024-06-18T21:43:06.192982843+02:00",
+                "magic": "6cece4896dda855f1f8eeb278295600f55147c3a4c822170dd54c64d426a45f0",
+                "version": "v3.116.0"
+            },
+            "secrets_providers": {
+                "type": "passphrase",
+                "state": {
+                    "salt": "v1:Pqc+zMVi/jk=:v1:qrWBTYDIcH2WqUmg:1THU1HTwRjJH4PGbQ3nmjuSlU+amrg=="
+                }
+            }
+        }
     }
 }
diff --git a/pulumi-state/.pulumi/stacks/holochain-infra/dev.json.attrs b/pulumi-state/.pulumi/stacks/holochain-infra/dev.json.attrs
@@ -1 +1 @@
-{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"text/plain; charset=utf-8","user.metadata":null,"md5":"AZ1e1ppALwhnaZYTPlHbvg=="}
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"text/plain; charset=utf-8","user.metadata":null,"md5":"67cPV+aK88FxD+NCXt+73Q=="}
diff --git a/pulumi-state/.pulumi/stacks/holochain-infra/dev.json.bak b/pulumi-state/.pulumi/stacks/holochain-infra/dev.json.bak
@@ -4,16 +4,51 @@
         "stack": "organization/holochain-infra/dev",
         "latest": {
             "manifest": {
-                "time": "2024-06-07T18:24:50.983868558Z",
+                "time": "2024-06-18T21:43:06.190613726+02:00",
                 "magic": "6cece4896dda855f1f8eeb278295600f55147c3a4c822170dd54c64d426a45f0",
                 "version": "v3.116.0"
             },
             "secrets_providers": {
                 "type": "passphrase",
                 "state": {
-                    "salt": "v1:KNBcfUHWy2o=:v1:YK042d91RPDBfWqV:xVlR2oJkhgzm/F+EivUGASLvrkTNRw=="
+                    "salt": "v1:Pqc+zMVi/jk=:v1:qrWBTYDIcH2WqUmg:1THU1HTwRjJH4PGbQ3nmjuSlU+amrg=="
                 }
-            }
+            },
+            "resources": [
+                {
+                    "urn": "urn:pulumi:dev::holochain-infra::pulumi:providers:random::default_4_16_2",
+                    "custom": true,
+                    "id": "9891b164-4d3d-42c9-8fba-a1562edb14b2",
+                    "type": "pulumi:providers:random",
+                    "inputs": {
+                        "version": "4.16.2"
+                    },
+                    "outputs": {
+                        "version": "4.16.2"
+                    },
+                    "created": "2024-06-18T19:25:20.331328844Z",
+                    "modified": "2024-06-18T19:25:20.331328844Z"
+                }
+            ],
+            "pending_operations": [
+                {
+                    "resource": {
+                        "urn": "urn:pulumi:dev::holochain-infra::pulumi:providers:random::default_4_16_2",
+                        "custom": true,
+                        "id": "9891b164-4d3d-42c9-8fba-a1562edb14b2",
+                        "type": "pulumi:providers:random",
+                        "inputs": {
+                            "version": "4.16.2"
+                        },
+                        "outputs": {
+                            "version": "4.16.2"
+                        },
+                        "created": "2024-06-18T19:25:20.331328844Z",
+                        "modified": "2024-06-18T19:25:20.331328844Z"
+                    },
+                    "type": "deleting"
+                }
+            ]
         }
     }
 }
diff --git a/pulumi-state/.pulumi/stacks/holochain-infra/dev.json.bak.attrs b/pulumi-state/.pulumi/stacks/holochain-infra/dev.json.bak.attrs
@@ -1 +1 @@
-{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"text/plain; charset=utf-8","user.metadata":null,"md5":"OPtgAXGZRxAY6HLA7bQefg=="}
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"text/plain; charset=utf-8","user.metadata":null,"md5":"Ts2Gcm66tXVyriUumxp7FQ=="}
diff --git a/pulumi/main.go b/pulumi/main.go
@@ -23,7 +23,10 @@ func main() {
 			return err
 		}
 
-		const node int = 195
+		// const node int = 195
+
+		// VM on x64-linux-dev-01
+		const node int = 206
 
 		mycelium_seed, err := random.NewRandomBytes(ctx, "mycelium_seed", &random.RandomBytesArgs{
 			Length: pulumi.Int(32),