feat: added CI configs

loic-roux-404 · May 22, 2024 · 423e81d · 423e81d
1 parent 3bec1d0
commit 423e81d
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 31 deletions.
diff --git a/.github/workflows/release-nixos.yml b/.github/workflows/release-nixos.yml
@@ -36,12 +36,12 @@ jobs:
 
       - name: Build
         id: build
-        run: .#nixosConfigurations.x86_64-linux.contabo
+        run: nix build .#nixosConfigurations.x86_64-linux.contabo
 
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
-          tag_name: nixos-k3s-paas-${{ steps.vars.outputs.sha_short }}
+          tag_name: nixos-${{ steps.vars.outputs.sha_short }}
           token: "${{ secrets.GITHUB_TOKEN }}"
           generate_release_notes: true
           files: |

diff --git a/Makefile b/Makefile
@@ -13,6 +13,9 @@ bootstrap:
 build:
 	@$(BUILDER_EXEC) nix build .#nixosConfigurations.aarch64-darwin.default --system aarch64-linux $(ARGS)
 
+build-x86:
+	@$(BUILDER_EXEC) nix build .#nixosConfigurations.x86_64-darwin.default --system x86_64-linux $(ARGS)
+
 #### Terraform
 
 TF_ROOT_DIRS := $(wildcard tf-root-*) .
@@ -32,4 +35,4 @@ $(TF_ROOT_DIRS_DESTROY):
 	@$(eval DIR:=$(subst -destroy,,$@))
 	@terraform -chdir=$(DIR) destroy -auto-approve $(ARGS)
 
-.PHONY: build bootstrap init $(TF_ROOT_DIRS) $(TF_ROOT_DIRS_DESTROY) $(TF_ROOT_DIRS_INIT)
+.PHONY: build build-x86 bootstrap init $(TF_ROOT_DIRS) $(TF_ROOT_DIRS_DESTROY) $(TF_ROOT_DIRS_INIT)
diff --git a/flake.nix b/flake.nix
@@ -94,8 +94,8 @@
 
         # Need a bare darwinConfigurations.builder started before building this one.
         builder-docker = self.darwinConfigurations.builder.override {
-          specialArgs = {
-            linux-builder-config = ./nixos-darwin/linux-builder-docker.nix;
+          extraModules = singleton {
+            nix.linux-builder.config = ./nixos-darwin/linux-builder-docker.nix;
           };
         };
 

diff --git a/nixos-darwin/configuration.nix b/nixos-darwin/configuration.nix
@@ -1,7 +1,6 @@
 { 
   pkgs,
   config, 
-  linux-builder-config ? ({ pkgs, ... }: {}),
   ... }:
 {
   programs.fish.enable = true;
@@ -101,8 +100,6 @@
     maxJobs = 8;
     package = pkgs.darwin.linux-builder-x86_64;
     ephemeral = true;
-    config = linux-builder-config;
-    systems = [ "aarch64-linux" "x86_64-linux" ];
   };
   nix.configureBuildUsers = true;
   services.nix-daemon.enable = true;

diff --git a/nixos-darwin/linux-builder-docker.nix b/nixos-darwin/linux-builder-docker.nix
@@ -1,4 +1,4 @@
-{ lib, ... }: {
+{ pkgs, lib, ... }: {
   virtualisation.docker.enable = true;
   virtualisation.docker.daemon.settings = {
     hosts = [ "tcp://0.0.0.0:2375" ];
@@ -8,8 +8,6 @@
     { from = "host"; guest.port = 22; host.port = 31022; }
     { from = "host"; guest.port = 2375; host.port = 2375; }
   ];
-  virtualisation.rosetta.enable = true;
-  nix.settings.extra-platforms = [ "x86_64-linux" ];
   security.sudo.wheelNeedsPassword = false;
   users.users.builder.extraGroups = lib.mkForce [ "docker" "wheel" ];
 }
diff --git a/nixos-options/default.nix b/nixos-options/default.nix
@@ -6,7 +6,7 @@
     certs = lib.mkOption {
       default = [{
         url = "https://localhost:15000/intermediates/0";
-        sha256 = "1vcm965pnkv24vgqg85qg8bjw10a5wr8rrnahm50yphak6jgxcmx";
+        sha256 = "06fpbiljbzmcnfsxnr92p7mhm6i4yglbhj5q7csw2pcsklw68z8n";
       }];
       type = lib.types.listOf (lib.types.attrs);
       description = "Ca url to fetch and trust (need to be impure)";

diff --git a/tf-root-contabo/main.tf b/tf-root-contabo/main.tf
@@ -31,13 +31,13 @@ resource "tailscale_tailnet_key" "k3s_paas_node" {
   description   = "VM instance key"
 }
 
-# resource "contabo_image" "paas_instance_qcow2" {
-#   name        = "k3s"
-#   image_url   = var.image_url
-#   os_type     = "Linux"
-#   version     = var.ubuntu_release_info.iso_version_tag
-#   description = "Generated PaaS vm image with packer"
-# }
+resource "contabo_image" "paas_instance_qcow2" {
+  name        = "k3s"
+  image_url   = var.image_url
+  os_type     = "Linux"
+  version     = var.ubuntu_release_info.iso_version_tag
+  description = "Generated PaaS vm image with packer"
+}
 
 data "contabo_instance" "paas_instance" {
   id = var.contabo_instance
@@ -64,15 +64,16 @@ resource "gandi_livedns_record" "www" {
     data.contabo_instance.paas_instance.ip_config[0].v4[0].ip
   ]
 }
-# resource "contabo_instance" "paas_instance" {
-#   existing_instance_id = var.contabo_instance
-#   display_name = "nixos-k3s-paas"
-#   image_id     = contabo_image.paas_instance_qcow2.id
-#   ssh_keys     = [contabo_secret.paas_instance_ssh_key.id]
-#   user_data = sensitive(templatefile(
-#     "${path.root}/user-data.yaml.tmpl",
-#     {
-#       tailscale_key = tailscale_tailnet_key.k3s_paas_node.key
-#     }
-#   ))
-# }
+
+resource "contabo_instance" "paas_instance" {
+  existing_instance_id = var.contabo_instance
+  display_name = "nixos-k3s-paas"
+  image_id     = contabo_image.paas_instance_qcow2.id
+  ssh_keys     = [contabo_secret.paas_instance_ssh_key.id]
+  user_data = sensitive(templatefile(
+    "${path.root}/user-data.yaml.tmpl",
+    {
+      tailscale_key = tailscale_tailnet_key.k3s_paas_node.key
+    }
+  ))
+}
diff --git a/tf-root-contabo/variables.tf b/tf-root-contabo/variables.tf
@@ -46,3 +46,8 @@ variable "gandi_token" {
 variable "gandi_dnssec_public_key" {
   type = string
 }
+
+variable "image_url" {
+  type = string
+  default = "https://github.com/loic-roux-404/k3s-paas/releases/download/nixos-a665502/nixos.qcow2"
+}