skipperoo · skipperoo · Aug 27, 2025 · Aug 29, 2025 · Aug 29, 2025 · Sep 1, 2025
diff --git a/.github/workflows/images-publish.yml b/.github/workflows/images-publish.yml
@@ -2,9 +2,12 @@ name: Build and Push Docker Images
 
 on:
   push:
-    branches: [master]
+    branches: [master, dev]
     paths:
-      - "images/**"
+      - "tsdb/**"
+      - "trackeroo-backend/**"
+      - "brokeroo/**"
+      - "flink_job/**"
   workflow_dispatch:
 
 jobs:
@@ -22,15 +25,33 @@ jobs:
           list-files: shell
           filters: |
             tsdb:
-              - 'images/tsdb/**'
+              - 'tsdb/**'
+            trackeroo-backend:
+              - "trackeroo-backend/**"
+            brokeroo:
+              - "brokeroo/**"
+            flink_job:
+              - "flink_job/**"
 
   build:
     needs: detect
     if: needs.detect.outputs.images != '[]'
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        image: ${{ fromJSON(needs.detect.outputs.images) }}
+        include:
+          - image: tsdb
+            context: ./tsdb
+            dockerfile: ./tsdb/Dockerfile
+          - image: trackeroo-backend
+            context: ./trackeroo-backend/src
+            dockerfile: ./trackeroo-backend/src/Dockerfile
+          - image: brokeroo
+            context: ./brokeroo
+            dockerfile: ./brokeroo/Dockerfile
+          - image: flink_job
+            context: ./flink_job
+            dockerfile: ./flink_job/Dockerfile
     permissions:
       contents: read
       packages: write
@@ -47,13 +68,14 @@ jobs:
       - name: Read version.yml
         id: version
         run: |
-          VERSION=$(yq e '.version' images/${{ matrix.image }}/version.yml)
+          VERSION=$(yq e '.version' ${{ matrix.context }}/version.yml)
           echo "version=$VERSION" >> $GITHUB_OUTPUT
 
       - name: Build and Push Docker image
         uses: docker/build-push-action@v6
         with:
-          context: ./images/${{ matrix.image }}
+          context: ${{ matrix.context }}
+          file: ${{ matrix.dockerfile }}
           push: true
           tags: |
             ghcr.io/${{ github.repository_owner }}/${{ matrix.image }}:${{ steps.version.outputs.version }}

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,9 @@
 *.qcow2
 *.pem
+*.class
+*.bin
+*.lock
+flink_job/.gradle
 secrets
 .pytest_cache
 __pycache__
@@ -11,7 +15,12 @@ tdevice.json
 claim.py
 status
 brockeroo
-grafana
+trackeroo-backend/grafana
 trackeroo-backend/mongo/data
 nominatim-data
 osrm-data
+trackeroo-backend/redis
+mqtt_client
+tracky/docker-compose.yml
+grafana.json
+.project
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic"
+}
diff --git a/bootstrap/cloud-init/nodes/user-data.yaml b/bootstrap/cloud-init/nodes/user-data.yaml
@@ -5,7 +5,7 @@ locale: en_US.UTF-8
 # User configuration
 users:
   - name: k3s-admin
-    passwd: $6$rounds=4096$v0k4/WEZZLQnikFD$1b5obdvCiCz.BffcjSUPS4MTPV7Ro6cr8J87HWpyonOQX7rX823rap/1mk/.plRFnMlhOvGLkuoWrgfCArZOb.
+    passwd: $6$rounds=4096$hctGKNXeELHL1wkO$Vqml85LbOZvpBoLjbU2Se77TLVVcX2GhP5MHXtF/amhAGSM36x7xviZzmBEkfoa06m6N3ZUCUkIsAid6myFvl.
     lock_passwd: false
     groups: sudo
     shell: /bin/bash

diff --git a/bootstrap/cloud-init/servers/user-data.yaml b/bootstrap/cloud-init/servers/user-data.yaml
@@ -5,7 +5,7 @@ locale: en_US.UTF-8
 # User configuration
 users:
   - name: k3s-admin
-    passwd: $6$rounds=4096$v0k4/WEZZLQnikFD$1b5obdvCiCz.BffcjSUPS4MTPV7Ro6cr8J87HWpyonOQX7rX823rap/1mk/.plRFnMlhOvGLkuoWrgfCArZOb.
+    passwd: $6$rounds=4096$B9SFui0p6YaAGZAF$PVHzzOun0HNCAOY4G6aJs.2EqXNwJiD3CE4/IFlaUs6e6HNGDl0CzpTmzkwTsBCUD4DLt5bFvn2q4fW5nFKBS0
     lock_passwd: false
     groups: sudo
     shell: /bin/bash

diff --git a/bootstrap/cloud-init/specs.yaml b/bootstrap/cloud-init/specs.yaml
@@ -1,7 +1,7 @@
 - machine_type: server
   name: k3s-server-cronus
-  cpu: 4
-  ram: 4096
+  cpu: 2
+  ram: 2048
   os_storage: 20
   longhorn_storage: 0
   networks:
@@ -15,8 +15,8 @@
       mac: 52:54:00:19:b9:c4
 - machine_type: server
   name: k3s-server-hyperion
-  cpu: 4
-  ram: 4096
+  cpu: 2
+  ram: 2048
   os_storage: 20
   longhorn_storage: 0
   networks:
@@ -30,8 +30,8 @@
       mac: 52:54:00:ba:81:7a
 - machine_type: server
   name: k3s-server-oceanus
-  cpu: 4
-  ram: 4096
+  cpu: 2
+  ram: 2048
   os_storage: 20
   longhorn_storage: 0
   networks:
@@ -45,8 +45,8 @@
       mac: 52:54:00:9b:6e:0b
 - machine_type: node
   name: k3s-node-hermes
-  cpu: 6
-  ram: 4096
+  cpu: 8
+  ram: 6144
   os_storage: 20
   longhorn_storage: 100
   networks:
@@ -60,8 +60,8 @@
       mac: 52:54:00:36:8c:61
 - machine_type: node
   name: k3s-node-achilles
-  cpu: 6
-  ram: 4096
+  cpu: 8
+  ram: 6144
   os_storage: 20
   longhorn_storage: 100
   networks:
@@ -75,8 +75,8 @@
       mac: 52:54:00:ca:d5:31
 - machine_type: node
   name: k3s-node-odysseus
-  cpu: 6
-  ram: 4096
+  cpu: 8
+  ram: 6144
   os_storage: 20
   longhorn_storage: 100
   networks:

diff --git a/bootstrap/k3s-ansible/playbooks/roles/k3s_agent/tasks/main.yml b/bootstrap/k3s-ansible/playbooks/roles/k3s_agent/tasks/main.yml
@@ -16,6 +16,6 @@
     curl -sfL https://get.k3s.io | K3S_URL="https://{{ kube_api_vip }}:6443" \
       INSTALL_K3S_VERSION="{{ k3s_version }}" \
       K3S_TOKEN="{{ leader_token.content | b64decode | trim }}" \
-      sh -s - agent --node-ip {{ hostvars[inventory_hostname].internal_ip }} --kubelet-arg node-status-update-frequency=5s
+      sh -s - agent --node-ip {{ hostvars[inventory_hostname].internal_ip }} --kubelet-arg node-status-update-frequency=5s --node-label "workload-type=apps"
   args:
     creates: /etc/rancher/k3s
diff --git a/bootstrap/k3s-ansible/playbooks/roles/k3s_server/templates/k3s_install.sh.j2 b/bootstrap/k3s-ansible/playbooks/roles/k3s_server/templates/k3s_install.sh.j2
@@ -29,6 +29,10 @@ sh -s - ${K3S_ROLE} ${K3S_CLUSTER_INIT} ${K3S_SERVER} \
   --tls-san {{ kube_api_vip }} \
   --flannel-iface {{ internal_interface }} \
   --disable-cloud-controller \
-  --disable servicelb
+  --disable servicelb \
+  --node-taint CriticalAddonsOnly=true:NoSchedule \
+  # --node-taint "workload-type=apps"
 
+# This is to prevent any workload from being scheduled on the servers.
+# --node-taint CriticalAddonsOnly=true:NoSchedule \
 echo "K3s server installation completed"
diff --git a/bootstrap/k3s-ansible/playbooks/roles/longhorn/tasks/main.yml b/bootstrap/k3s-ansible/playbooks/roles/longhorn/tasks/main.yml
@@ -122,6 +122,7 @@
         name: "{{ item }}"
         namespace: longhorn-system
       spec:
+        name: "{{ item }}"
         allowScheduling: false
 
   loop: "{{ groups['servers'] }}"

diff --git a/bootstrap/k3s-ansible/playbooks/site.yml b/bootstrap/k3s-ansible/playbooks/site.yml
@@ -21,6 +21,7 @@
 
 - name: Deploy MetalLB and configure IP pool
   hosts: servers[0]
+  tags: metallb
   run_once: true
   roles:
     - metallb

diff --git a/trackeroo-backend/brokeroo/Dockerfile → brokeroo/Dockerfile b/trackeroo-backend/brokeroo/Dockerfile → brokeroo/Dockerfile