From 514909fc8d94773e1f9a160b19e25a3a09490638 Mon Sep 17 00:00:00 2001 From: shockrah Date: Mon, 30 Jun 2025 14:32:17 -0700 Subject: [PATCH 1/3] Removing nomad and consul in favor of K3S for more well supported architecture --- ansible/nuc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/nuc.yaml b/ansible/nuc.yaml index a84ba7b..13e0e86 100644 --- a/ansible/nuc.yaml +++ b/ansible/nuc.yaml @@ -1,5 +1,5 @@ --- -- name: Setup bare metal requirements for nomad +- name: Setup bare metal requirements hosts: nigel.local remote_user: nigel tasks: From e183055282512ca3d4a3badb689626ae5a1889b1 Mon Sep 17 00:00:00 2001 From: shockrah Date: Mon, 14 Jul 2025 20:12:44 -0700 Subject: [PATCH 2/3] Nomad removal --- ansible/roles/base/tasks/k3s.yaml | 8 +++++ ansible/roles/base/tasks/nomad.yaml | 54 ----------------------------- infra/nigel-nomad/nfs.nomad.hcl | 34 ++++++++++++++++++ 3 files changed, 42 insertions(+), 54 deletions(-) create mode 100644 ansible/roles/base/tasks/k3s.yaml delete mode 100644 ansible/roles/base/tasks/nomad.yaml create mode 100644 infra/nigel-nomad/nfs.nomad.hcl diff --git a/ansible/roles/base/tasks/k3s.yaml b/ansible/roles/base/tasks/k3s.yaml new file mode 100644 index 0000000..0aad994 --- /dev/null +++ b/ansible/roles/base/tasks/k3s.yaml @@ -0,0 +1,8 @@ +- name: Download the setup script + ansible.builtin.get_url: + url: https://get.k3s.io + dest: /tmp/k3s.sh + mode: "0644" +- name: Run installation script + ansible.builtin.command: + cmd: bash /tmp/k3s.sh diff --git a/ansible/roles/base/tasks/nomad.yaml b/ansible/roles/base/tasks/nomad.yaml deleted file mode 100644 index b864fc1..0000000 --- a/ansible/roles/base/tasks/nomad.yaml +++ /dev/null @@ -1,54 +0,0 @@ -- name: Ensure prerequisite packages are installed - ansible.builtin.apt: - pkg: - - wget - - gpg - - coreutils - update_cache: true -- name: Hashicorp repo setup - vars: - keypath: /usr/share/keyrings/hashicorp-archive-keyring.gpg - gpgpath: /tmp/hashicorp.gpg - block: - - name: Download the hashicorp GPG Key - ansible.builtin.get_url: - url: https://apt.releases.hashicorp.com/gpg - dest: "{{ gpgpath }}" - mode: "0755" - - name: Dearmor the hashicorp gpg key - ansible.builtin.command: - cmd: "gpg --dearmor --yes -o {{ keypath }} {{ gpgpath }}" - register: gpg - changed_when: gpg.rc == 0 - - name: Add the hashicorp linux repo - vars: - keyfile: "{{ keypath }}" - ansible.builtin.template: - src: hashicorp.list - dest: /etc/apt/sources.list.d/hashicorp.list - mode: "0644" - - name: Update apt repo cache - ansible.builtin.apt: - update_cache: true -- name: Install consul - ansible.builtin.apt: - name: consul - state: absent -- name: Install nomad package - ansible.builtin.apt: - pkg: nomad - state: absent -- name: Remove the bare metal consul template - ansible.builtin.file: - path: /etc/consul.d/consul.hcl - state: absent -- name: Start nomad - ansible.builtin.systemd_service: - name: nomad - state: stopped - enabled: false -- name: Make sure the consul service is NOT available - ansible.builtin.systemd_service: - name: consul - state: stopped - enabled: false diff --git a/infra/nigel-nomad/nfs.nomad.hcl b/infra/nigel-nomad/nfs.nomad.hcl new file mode 100644 index 0000000..3c2b838 --- /dev/null +++ b/infra/nigel-nomad/nfs.nomad.hcl @@ -0,0 +1,34 @@ +# Nigel's NFS that we use for rando stuff +job "nfs" { + type = "service" + + group "nfs" { + count = 1 + network { + port "v4" { + static = 2049 + } + } + + service { + name = "nfs" + port = "v4" + provider = "nomad" + } + + volume "nfs_files" { + type = "host" + read_only = false + source = "nfs" + } + task "nfs" { + driver = "docker" + + config { + image = "erichough/nfs-server" + ports = [ "v4" ] + args = ["--cap-add", "SYS_ADMIN"] + } + } + } +} From 2ef4b0009739034d68205769172dcc74a583b751 Mon Sep 17 00:00:00 2001 From: shockrah Date: Mon, 14 Jul 2025 20:43:40 -0700 Subject: [PATCH 3/3] Removing old nomad configs --- infra/nigel-nomad/nfs.nomad.hcl | 34 ---------------- infra/nigel-nomad/registry.hcl | 46 ---------------------- infra/nigel-nomad/sanity-service.nomad.hcl | 30 -------------- 3 files changed, 110 deletions(-) delete mode 100644 infra/nigel-nomad/nfs.nomad.hcl delete mode 100644 infra/nigel-nomad/registry.hcl delete mode 100644 infra/nigel-nomad/sanity-service.nomad.hcl diff --git a/infra/nigel-nomad/nfs.nomad.hcl b/infra/nigel-nomad/nfs.nomad.hcl deleted file mode 100644 index 3c2b838..0000000 --- a/infra/nigel-nomad/nfs.nomad.hcl +++ /dev/null @@ -1,34 +0,0 @@ -# Nigel's NFS that we use for rando stuff -job "nfs" { - type = "service" - - group "nfs" { - count = 1 - network { - port "v4" { - static = 2049 - } - } - - service { - name = "nfs" - port = "v4" - provider = "nomad" - } - - volume "nfs_files" { - type = "host" - read_only = false - source = "nfs" - } - task "nfs" { - driver = "docker" - - config { - image = "erichough/nfs-server" - ports = [ "v4" ] - args = ["--cap-add", "SYS_ADMIN"] - } - } - } -} diff --git a/infra/nigel-nomad/registry.hcl b/infra/nigel-nomad/registry.hcl deleted file mode 100644 index 9192b34..0000000 --- a/infra/nigel-nomad/registry.hcl +++ /dev/null @@ -1,46 +0,0 @@ -# Nigel's Container Registry -job "ncr" { - type = "service" - - group "ncr" { - count = 1 - network { - port "docker" { - static = 5000 - } - } - - service { - name = "ncr" - port = "docker" - provider = "nomad" - } - - volume "container_images" { - type = "host" - read_only = false - source = "registry" - } - - restart { - attempts = 10 - interval = "5m" - delay = "30s" - mode = "delay" - } - - task "ncr" { - driver = "docker" - - volume_mount { - volume = "container_images" - destination = "/registry/data" - read_only = false - } - config { - image = "registry:latest" - ports = [ "docker" ] - } - } - } -} \ No newline at end of file diff --git a/infra/nigel-nomad/sanity-service.nomad.hcl b/infra/nigel-nomad/sanity-service.nomad.hcl deleted file mode 100644 index f0a0e4f..0000000 --- a/infra/nigel-nomad/sanity-service.nomad.hcl +++ /dev/null @@ -1,30 +0,0 @@ -# This 'service' job is just a simple nginx container that lives here as a kind of sanity check -# PORT: 8080 -# DNS : sanity.nigel.local -job "health" { - type = "service" - - group "health" { - count = 1 - network { - port "http" { - static = 8080 - } - } - - service { - name = "health-svc" - port = "http" - provider = "nomad" - } - - task "health-setup" { - driver = "docker" - - config { - image = "shockrah/sanity:latest" - ports = [ "http" ] - } - } - } -} \ No newline at end of file