From 125a75629c7368258798079c35a523a248a2497f Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 7 Feb 2024 15:05:22 -0500 Subject: [PATCH 01/78] Linting --- os/routers/glmain/config.yaml | 5 ++++- os/routers/glmain/gen-mappings.py | 1 + os/routers/glmain/output/etc/dnsmasq.conf | 2 ++ os/routers/glmain/output/summary.yaml | 6 +++++- os/routers/glmain/push.sh | 20 ++++++++++++-------- 5 files changed, 24 insertions(+), 10 deletions(-) diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml index 18d80bd..01426b3 100644 --- a/os/routers/glmain/config.yaml +++ b/os/routers/glmain/config.yaml @@ -47,4 +47,7 @@ iot: - name: 'apollo-eddie' mac: '30:30:F9:DC:A8:18' - name: 'apollo-office' - mac: '30:30:F9:DA:C7:A4' \ No newline at end of file + mac: '30:30:F9:DA:C7:A4' +apl: + - name: 'hp-print' + mac: '48:9E:BD:CB:07:E3' \ No newline at end of file diff --git a/os/routers/glmain/gen-mappings.py b/os/routers/glmain/gen-mappings.py index ca9189d..80418e2 100755 --- a/os/routers/glmain/gen-mappings.py +++ b/os/routers/glmain/gen-mappings.py @@ -20,6 +20,7 @@ ip_prefix_map = { "hub": "10.0.12.", "cam": "10.0.13.", "iot": "10.0.14.", + "apl": "10.0.15." } def cap1_and_join(*args: str) -> str: diff --git a/os/routers/glmain/output/etc/dnsmasq.conf b/os/routers/glmain/output/etc/dnsmasq.conf index 8174c91..b4b9546 100644 --- a/os/routers/glmain/output/etc/dnsmasq.conf +++ b/os/routers/glmain/output/etc/dnsmasq.conf @@ -48,3 +48,5 @@ dhcp-host=30:30:F9:DC:A8:18,IotApollo-eddie,10.0.14.4,infinite address=/apollo-eddie.iot.internal/10.0.14.4 dhcp-host=30:30:F9:DA:C7:A4,IotApollo-office,10.0.14.5,infinite address=/apollo-office.iot.internal/10.0.14.5 +dhcp-host=48:9E:BD:CB:07:E3,AplHp-print,10.0.15.1,infinite +address=/hp-print.apl.internal/10.0.15.1 diff --git a/os/routers/glmain/output/summary.yaml b/os/routers/glmain/output/summary.yaml index 2d26d1a..e71f751 100644 --- a/os/routers/glmain/output/summary.yaml +++ b/os/routers/glmain/output/summary.yaml @@ -68,4 +68,8 @@ Iot: host: "apollo-eddie.iot.internal" Apollo-office: ip: "10.0.14.5" - host: "apollo-office.iot.internal" \ No newline at end of file + host: "apollo-office.iot.internal" +Apl: + Hp-print: + ip: "10.0.15.1" + host: "hp-print.apl.internal" \ No newline at end of file diff --git a/os/routers/glmain/push.sh b/os/routers/glmain/push.sh index 7b8cd59..f4e61c3 100755 --- a/os/routers/glmain/push.sh +++ b/os/routers/glmain/push.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -BASE_PATH=$(realpath $BASH_SOURCE | xargs dirname) +BASE_PATH=$(realpath "${BASH_SOURCE[0]}" | xargs dirname) ROUTER=${1:-10.0.0.1} USER=${2:-root} @@ -23,17 +23,17 @@ function ask { server=$USER@$ROUTER echo "using 🤖 $server" -pushd $BASE_PATH +pushd "$BASE_PATH" || exit 1 echo "Updating conf..." ./gen-mappings.py cat output/summary.yaml -ask +ask "continue update" -scp -O output/etc/dnsmasq.conf $USER@$ROUTER:/tmp/dnsmasq.new.conf -ssh $USER@$ROUTER << EOF -echo "Backing up dnsmasq.conf file to /tmp/dnsmasq.old.conf" +scp -O output/etc/dnsmasq.conf "$server:/tmp/dnsmasq.new.conf" +ssh "$server" << EOF +echo 'Backing up dnsmasq.conf file to /tmp/dnsmasq.old.conf' cp /etc/dnsmasq.conf /tmp/dnsmasq.old.conf -echo "Updating dnsmasq.conf 🙇🏼" +echo 'Updating dnsmasq.conf 🙇🏼' cp /tmp/dnsmasq.new.conf /etc/dnsmasq.conf if dnsmasq --test ; then /etc/init.d/dnsmasq restart @@ -44,4 +44,8 @@ else dnsmasq --test echo "Revert successful! 👍" fi -EOF \ No newline at end of file +EOF + +git add . +git commit -m "Updated Router Config at $(date)" +git push \ No newline at end of file From 79556579ea7823a52e04704a06874270d7882f1f Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 7 Feb 2024 15:06:06 -0500 Subject: [PATCH 02/78] Updated Router Config at Wed Feb 7 15:06:06 EST 2024 --- os/routers/glmain/push.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/os/routers/glmain/push.sh b/os/routers/glmain/push.sh index f4e61c3..b859a00 100755 --- a/os/routers/glmain/push.sh +++ b/os/routers/glmain/push.sh @@ -21,9 +21,10 @@ function ask { server=$USER@$ROUTER -echo "using 🤖 $server" - pushd "$BASE_PATH" || exit 1 +echo "using 🤖 $server" +ask "continue update" + echo "Updating conf..." ./gen-mappings.py cat output/summary.yaml From b5262812b1154d980b7a784d89244ca58b9f91a4 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 7 Feb 2024 15:06:23 -0500 Subject: [PATCH 03/78] Updated commit message --- os/routers/glmain/push.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os/routers/glmain/push.sh b/os/routers/glmain/push.sh index b859a00..24665be 100755 --- a/os/routers/glmain/push.sh +++ b/os/routers/glmain/push.sh @@ -48,5 +48,5 @@ fi EOF git add . -git commit -m "Updated Router Config at $(date)" +git commit -m "🤖 Updated Router Config at $(date)" git push \ No newline at end of file From 738259d8b28129ef976f3f959ad6bce45f8acd50 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 7 Feb 2024 16:08:24 -0500 Subject: [PATCH 04/78] =?UTF-8?q?=F0=9F=A4=96=20Updated=20Router=20Config?= =?UTF-8?q?=20at=20Wed=20Feb=20=207=2016:08:24=20EST=202024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- os/routers/glmain/config.yaml | 1 + os/routers/glmain/output/etc/dnsmasq.conf | 2 ++ os/routers/glmain/output/summary.yaml | 1 + 3 files changed, 4 insertions(+) diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml index 01426b3..2defd0b 100644 --- a/os/routers/glmain/config.yaml +++ b/os/routers/glmain/config.yaml @@ -1,6 +1,7 @@ lab: - mac: '3C:7C:3F:1E:B7:A0' name: 'tnas1' + domain: 'tnas1.lab.local' - mac: '00:A0:98:3D:7C:C8' name: 'kubedb' - mac: 'B8:27:EB:F7:44:4E' diff --git a/os/routers/glmain/output/etc/dnsmasq.conf b/os/routers/glmain/output/etc/dnsmasq.conf index b4b9546..49d5d03 100644 --- a/os/routers/glmain/output/etc/dnsmasq.conf +++ b/os/routers/glmain/output/etc/dnsmasq.conf @@ -1,5 +1,7 @@ dhcp-host=3C:7C:3F:1E:B7:A0,LabTnas1,10.0.10.1,infinite address=/tnas1.lab.internal/10.0.10.1 +address=/tnas1.lab.local/10.0.10.1 +address=/.tnas1.lab.local/10.0.10.1 dhcp-host=00:A0:98:3D:7C:C8,LabKubedb,10.0.10.2,infinite address=/kubedb.lab.internal/10.0.10.2 dhcp-host=B8:27:EB:F7:44:4E,LabPi1,10.0.10.3,infinite diff --git a/os/routers/glmain/output/summary.yaml b/os/routers/glmain/output/summary.yaml index e71f751..0721b81 100644 --- a/os/routers/glmain/output/summary.yaml +++ b/os/routers/glmain/output/summary.yaml @@ -3,6 +3,7 @@ Lab: Tnas1: ip: "10.0.10.1" host: "tnas1.lab.internal" + domain: "tnas1.lab.local" Kubedb: ip: "10.0.10.2" host: "kubedb.lab.internal" From fa63991604e535fc531d8bf5f4cee0dbc5d2b18f Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 7 Feb 2024 18:18:15 -0500 Subject: [PATCH 05/78] Fixed ingress --- k8s/apps/ingresses/templates/reverse-proxy.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/k8s/apps/ingresses/templates/reverse-proxy.yaml b/k8s/apps/ingresses/templates/reverse-proxy.yaml index a407b4f..8605c72 100644 --- a/k8s/apps/ingresses/templates/reverse-proxy.yaml +++ b/k8s/apps/ingresses/templates/reverse-proxy.yaml @@ -10,10 +10,6 @@ subsets: ports: - port: {{ $data.port | default 80 }} protocol: TCP - {{ range $p := ($data.additionalPorts | default [] )}} - - port: "{{ $p.port }}" - protocol: "{{ $p.protocol | default 'TCP' }}" - {{ end }}` --- apiVersion: v1 kind: Service @@ -25,12 +21,6 @@ spec: - port: 80 protocol: TCP targetPort: {{ $data.port | default 80 }} - {{ range $p := ($data.additionalPorts | default [])}} - - port: "{{ $p.port }}" - protocol: "{{ $p.protocol | default 'TCP' }}" - targetPort: "{{ $p.port }}" - name: "{{ $p.name | default $p.port }}" - {{ end }}` {{ if (not $data.disableIngress) }} {{- $ingressDef := (dict "service" (printf "reverse-proxy-%s" $prefix) "prefix" $prefix "global" $.Values.global "namespace" $.Release.Namespace "group" "reverse-proxies" ) -}} {{- $ingressDef := (merge ($data.overrides | default (dict)) $ingressDef) -}} From 526b36ae81fc637190d41f87b22f8e8a85b9991a Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 7 Feb 2024 18:50:16 -0500 Subject: [PATCH 06/78] migrating prom to use nfs --- k8s/argoapps/chart-values/prometheus.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/argoapps/chart-values/prometheus.yaml b/k8s/argoapps/chart-values/prometheus.yaml index 51e81c1..baea455 100644 --- a/k8s/argoapps/chart-values/prometheus.yaml +++ b/k8s/argoapps/chart-values/prometheus.yaml @@ -66,7 +66,7 @@ prometheus: storageSpec: volumeClaimTemplate: spec: - storageClassName: local-path + storageClassName: {{ .Values.global.nfs.storageClass }} accessModes: ["ReadWriteOnce"] resources: requests: From 355ca397a20faf339113a4c13fdf7b2b47cc01ee Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 7 Feb 2024 18:53:06 -0500 Subject: [PATCH 07/78] using special domains --- k8s/apps/ingresses/values-prod.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/k8s/apps/ingresses/values-prod.yaml b/k8s/apps/ingresses/values-prod.yaml index e0b4e8f..1573dad 100644 --- a/k8s/apps/ingresses/values-prod.yaml +++ b/k8s/apps/ingresses/values-prod.yaml @@ -3,32 +3,32 @@ global: enabled: true reverseProxy: castle: - ip: "192.168.0.23" + ip: "castle.hub.internal" port: "80" overrides: icon: https://castle.home.sosnovsky.ca/static/icons/favicon.ico kuma: - ip: "192.168.0.23" + ip: "castle.hub.internal" port: "3001" overrides: icon: "https://kuma.home.sosnovsky.ca/apple-touch-icon.png" basement: - ip: "192.168.1.10" + ip: "basement.hub.internal" port: "8123" overrides: icon: https://basement.home.sosnovsky.ca/static/icons/favicon.ico - scrypted: - disableIngress: true - ip: "192.168.0.200" - port: "11080" + # scrypted: + # disableIngress: true + # ip: "192.168.0.200" + # port: "11080" - glroutermetrics: - disableIngress: true - ip: "192.168.8.1" - port: "11080" + # glroutermetrics: + # disableIngress: true + # ip: "192.168.8.1" + # port: "11080" cloudflare: enabled: true \ No newline at end of file From de7b866c29a4f1760d81d46b38e3458ef6c22e72 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 7 Feb 2024 18:57:24 -0500 Subject: [PATCH 08/78] using ips again --- k8s/apps/ingresses/values-prod.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/k8s/apps/ingresses/values-prod.yaml b/k8s/apps/ingresses/values-prod.yaml index 1573dad..3e45f8e 100644 --- a/k8s/apps/ingresses/values-prod.yaml +++ b/k8s/apps/ingresses/values-prod.yaml @@ -3,19 +3,19 @@ global: enabled: true reverseProxy: castle: - ip: "castle.hub.internal" + ip: "10.0.12.1" port: "80" overrides: icon: https://castle.home.sosnovsky.ca/static/icons/favicon.ico kuma: - ip: "castle.hub.internal" + ip: "10.0.12.1" port: "3001" overrides: icon: "https://kuma.home.sosnovsky.ca/apple-touch-icon.png" basement: - ip: "basement.hub.internal" + ip: "10.0.12.2" port: "8123" overrides: icon: https://basement.home.sosnovsky.ca/static/icons/favicon.ico From 45a0e0d947dfa37b3a2420883e726e3b43573fc5 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 7 Feb 2024 21:48:07 -0500 Subject: [PATCH 09/78] pitorrent --- k8s/apps/ingresses/values-prod.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/k8s/apps/ingresses/values-prod.yaml b/k8s/apps/ingresses/values-prod.yaml index 3e45f8e..4dce81e 100644 --- a/k8s/apps/ingresses/values-prod.yaml +++ b/k8s/apps/ingresses/values-prod.yaml @@ -20,6 +20,12 @@ reverseProxy: overrides: icon: https://basement.home.sosnovsky.ca/static/icons/favicon.ico + pitorrent: + ip: "10.0.10.3" + port: "8080" + overrides: + middleware: "apps-ingresses-chain-authentik" + # scrypted: # disableIngress: true # ip: "192.168.0.200" From 589bd42b49a399aadb5a7ac01050e858a73ba7a9 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 7 Feb 2024 21:57:23 -0500 Subject: [PATCH 10/78] added missing cats --- k8s/apps/ingresses/values-prod.yaml | 1 + k8s/argoapps/apps-values/ingresses.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/k8s/apps/ingresses/values-prod.yaml b/k8s/apps/ingresses/values-prod.yaml index 4dce81e..1633512 100644 --- a/k8s/apps/ingresses/values-prod.yaml +++ b/k8s/apps/ingresses/values-prod.yaml @@ -25,6 +25,7 @@ reverseProxy: port: "8080" overrides: middleware: "apps-ingresses-chain-authentik" + group: "Video Hosting" # scrypted: # disableIngress: true diff --git a/k8s/argoapps/apps-values/ingresses.yaml b/k8s/argoapps/apps-values/ingresses.yaml index 51e862b..ca2c849 100644 --- a/k8s/argoapps/apps-values/ingresses.yaml +++ b/k8s/argoapps/apps-values/ingresses.yaml @@ -97,6 +97,7 @@ services: service: "prowlarr" namespace: "apps-videohosting" middleware: "apps-ingresses-chain-authentik" + group: "Video Hosting" - prefix: "readarr.vh" service: "readarr" namespace: "apps-videohosting" From 1fcdf36dc1c4af5a6a8d52e9c025dcd658ada945 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 8 Feb 2024 09:36:12 -0500 Subject: [PATCH 11/78] =?UTF-8?q?=F0=9F=A4=96=20Updated=20Router=20Config?= =?UTF-8?q?=20at=20Thu=20Feb=20=208=2009:36:12=20EST=202024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- os/routers/glmain/config.yaml | 28 +++++++++++------------ os/routers/glmain/output/etc/dnsmasq.conf | 12 ---------- os/routers/glmain/output/summary.yaml | 22 +----------------- 3 files changed, 15 insertions(+), 47 deletions(-) diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml index 2defd0b..d8978a0 100644 --- a/os/routers/glmain/config.yaml +++ b/os/routers/glmain/config.yaml @@ -38,17 +38,17 @@ cam: mac: '48:9E:9D:4A:32:80' - name: 'livingroom' mac: '34:60:F9:D7:51:3F' -iot: - - name: 'korie-lamp' - mac: '60:74:F4:4D:B8:C5' - - name: 'office-strip' - mac: 'DC:4F:22:24:0C:E4' - - name: 'ecobee' - mac: '44:61:32:FC:10:EC' - - name: 'apollo-eddie' - mac: '30:30:F9:DC:A8:18' - - name: 'apollo-office' - mac: '30:30:F9:DA:C7:A4' -apl: - - name: 'hp-print' - mac: '48:9E:BD:CB:07:E3' \ No newline at end of file +# iot: +# - name: 'korie-lamp' +# mac: '60:74:F4:4D:B8:C5' +# - name: 'office-strip' +# mac: 'DC:4F:22:24:0C:E4' +# - name: 'ecobee' +# mac: '44:61:32:FC:10:EC' +# - name: 'apollo-eddie' +# mac: '30:30:F9:DC:A8:18' +# - name: 'apollo-office' +# mac: '30:30:F9:DA:C7:A4' +# apl: +# - name: 'hp-print' +# mac: '48:9E:BD:CB:07:E3' \ No newline at end of file diff --git a/os/routers/glmain/output/etc/dnsmasq.conf b/os/routers/glmain/output/etc/dnsmasq.conf index 49d5d03..01d79d2 100644 --- a/os/routers/glmain/output/etc/dnsmasq.conf +++ b/os/routers/glmain/output/etc/dnsmasq.conf @@ -40,15 +40,3 @@ dhcp-host=48:9E:9D:4A:32:80,CamDoorbell,10.0.13.3,infinite address=/doorbell.cam.internal/10.0.13.3 dhcp-host=34:60:F9:D7:51:3F,CamLivingroom,10.0.13.4,infinite address=/livingroom.cam.internal/10.0.13.4 -dhcp-host=60:74:F4:4D:B8:C5,IotKorie-lamp,10.0.14.1,infinite -address=/korie-lamp.iot.internal/10.0.14.1 -dhcp-host=DC:4F:22:24:0C:E4,IotOffice-strip,10.0.14.2,infinite -address=/office-strip.iot.internal/10.0.14.2 -dhcp-host=44:61:32:FC:10:EC,IotEcobee,10.0.14.3,infinite -address=/ecobee.iot.internal/10.0.14.3 -dhcp-host=30:30:F9:DC:A8:18,IotApollo-eddie,10.0.14.4,infinite -address=/apollo-eddie.iot.internal/10.0.14.4 -dhcp-host=30:30:F9:DA:C7:A4,IotApollo-office,10.0.14.5,infinite -address=/apollo-office.iot.internal/10.0.14.5 -dhcp-host=48:9E:BD:CB:07:E3,AplHp-print,10.0.15.1,infinite -address=/hp-print.apl.internal/10.0.15.1 diff --git a/os/routers/glmain/output/summary.yaml b/os/routers/glmain/output/summary.yaml index 0721b81..5e1f5d8 100644 --- a/os/routers/glmain/output/summary.yaml +++ b/os/routers/glmain/output/summary.yaml @@ -53,24 +53,4 @@ Cam: host: "doorbell.cam.internal" Livingroom: ip: "10.0.13.4" - host: "livingroom.cam.internal" -Iot: - Korie-lamp: - ip: "10.0.14.1" - host: "korie-lamp.iot.internal" - Office-strip: - ip: "10.0.14.2" - host: "office-strip.iot.internal" - Ecobee: - ip: "10.0.14.3" - host: "ecobee.iot.internal" - Apollo-eddie: - ip: "10.0.14.4" - host: "apollo-eddie.iot.internal" - Apollo-office: - ip: "10.0.14.5" - host: "apollo-office.iot.internal" -Apl: - Hp-print: - ip: "10.0.15.1" - host: "hp-print.apl.internal" \ No newline at end of file + host: "livingroom.cam.internal" \ No newline at end of file From 9e0d38dcce249d0b9cc9e0afec2a27c4807b47e5 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 8 Feb 2024 11:03:02 -0500 Subject: [PATCH 12/78] =?UTF-8?q?=F0=9F=A4=96=20Updated=20Router=20Config?= =?UTF-8?q?=20at=20Thu=20Feb=20=208=2011:03:02=20EST=202024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- os/routers/glmain/config.yaml | 36 +++++++++++------------ os/routers/glmain/output/etc/dnsmasq.conf | 20 ++++++++----- os/routers/glmain/output/summary.yaml | 26 ++++++++++++---- 3 files changed, 51 insertions(+), 31 deletions(-) diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml index d8978a0..649a94c 100644 --- a/os/routers/glmain/config.yaml +++ b/os/routers/glmain/config.yaml @@ -14,19 +14,19 @@ k3s: domain: home.sosnovsky.ca - mac: '68:1D:EF:26:B7:6C' name: 'terry1' - domain: home.sosnovsky.ca + # domain: home.sosnovsky.ca - mac: '58:47:CA:71:D8:E6' name: 'minisf1' - domain: home.sosnovsky.ca + # domain: home.sosnovsky.ca - mac: '00:A0:98:17:B2:64' name: 'tnas1' hub: - mac: 'E4:5F:01:A2:8D:BC' name: 'castle' - domain: castle.home.sosnovsky.ca + # domain: castle.home.sosnovsky.ca - mac: 'DC:A6:32:92:B2:79' name: 'basement' - domain: basement.home.sosnovsky.ca + # domain: basement.home.sosnovsky.ca - mac: '4E:F6:9C:7C:56:33' name: 'flic' cam: @@ -38,17 +38,17 @@ cam: mac: '48:9E:9D:4A:32:80' - name: 'livingroom' mac: '34:60:F9:D7:51:3F' -# iot: -# - name: 'korie-lamp' -# mac: '60:74:F4:4D:B8:C5' -# - name: 'office-strip' -# mac: 'DC:4F:22:24:0C:E4' -# - name: 'ecobee' -# mac: '44:61:32:FC:10:EC' -# - name: 'apollo-eddie' -# mac: '30:30:F9:DC:A8:18' -# - name: 'apollo-office' -# mac: '30:30:F9:DA:C7:A4' -# apl: -# - name: 'hp-print' -# mac: '48:9E:BD:CB:07:E3' \ No newline at end of file +iot: + - name: 'korie-lamp' + mac: '60:74:F4:4D:B8:C5' + - name: 'office-strip' + mac: 'DC:4F:22:24:0C:E4' + - name: 'ecobee' + mac: '44:61:32:FC:10:EC' + - name: 'apollo-eddie' + mac: '30:30:F9:DC:A8:18' + - name: 'apollo-office' + mac: '30:30:F9:DA:C7:A4' +apl: + - name: 'hp-print' + mac: '48:9E:BD:CB:07:E3' \ No newline at end of file diff --git a/os/routers/glmain/output/etc/dnsmasq.conf b/os/routers/glmain/output/etc/dnsmasq.conf index 01d79d2..fd46d03 100644 --- a/os/routers/glmain/output/etc/dnsmasq.conf +++ b/os/routers/glmain/output/etc/dnsmasq.conf @@ -14,22 +14,14 @@ address=/home.sosnovsky.ca/10.0.11.1 address=/.home.sosnovsky.ca/10.0.11.1 dhcp-host=68:1D:EF:26:B7:6C,K3sTerry1,10.0.11.2,infinite address=/terry1.k3s.internal/10.0.11.2 -address=/home.sosnovsky.ca/10.0.11.2 -address=/.home.sosnovsky.ca/10.0.11.2 dhcp-host=58:47:CA:71:D8:E6,K3sMinisf1,10.0.11.3,infinite address=/minisf1.k3s.internal/10.0.11.3 -address=/home.sosnovsky.ca/10.0.11.3 -address=/.home.sosnovsky.ca/10.0.11.3 dhcp-host=00:A0:98:17:B2:64,K3sTnas1,10.0.11.4,infinite address=/tnas1.k3s.internal/10.0.11.4 dhcp-host=E4:5F:01:A2:8D:BC,HubCastle,10.0.12.1,infinite address=/castle.hub.internal/10.0.12.1 -address=/castle.home.sosnovsky.ca/10.0.12.1 -address=/.castle.home.sosnovsky.ca/10.0.12.1 dhcp-host=DC:A6:32:92:B2:79,HubBasement,10.0.12.2,infinite address=/basement.hub.internal/10.0.12.2 -address=/basement.home.sosnovsky.ca/10.0.12.2 -address=/.basement.home.sosnovsky.ca/10.0.12.2 dhcp-host=4E:F6:9C:7C:56:33,HubFlic,10.0.12.3,infinite address=/flic.hub.internal/10.0.12.3 dhcp-host=9C:8E:CD:25:83:1F,CamKorie,10.0.13.1,infinite @@ -40,3 +32,15 @@ dhcp-host=48:9E:9D:4A:32:80,CamDoorbell,10.0.13.3,infinite address=/doorbell.cam.internal/10.0.13.3 dhcp-host=34:60:F9:D7:51:3F,CamLivingroom,10.0.13.4,infinite address=/livingroom.cam.internal/10.0.13.4 +dhcp-host=60:74:F4:4D:B8:C5,IotKorie-lamp,10.0.14.1,infinite +address=/korie-lamp.iot.internal/10.0.14.1 +dhcp-host=DC:4F:22:24:0C:E4,IotOffice-strip,10.0.14.2,infinite +address=/office-strip.iot.internal/10.0.14.2 +dhcp-host=44:61:32:FC:10:EC,IotEcobee,10.0.14.3,infinite +address=/ecobee.iot.internal/10.0.14.3 +dhcp-host=30:30:F9:DC:A8:18,IotApollo-eddie,10.0.14.4,infinite +address=/apollo-eddie.iot.internal/10.0.14.4 +dhcp-host=30:30:F9:DA:C7:A4,IotApollo-office,10.0.14.5,infinite +address=/apollo-office.iot.internal/10.0.14.5 +dhcp-host=48:9E:BD:CB:07:E3,AplHp-print,10.0.15.1,infinite +address=/hp-print.apl.internal/10.0.15.1 diff --git a/os/routers/glmain/output/summary.yaml b/os/routers/glmain/output/summary.yaml index 5e1f5d8..317581f 100644 --- a/os/routers/glmain/output/summary.yaml +++ b/os/routers/glmain/output/summary.yaml @@ -21,11 +21,9 @@ K3s: Terry1: ip: "10.0.11.2" host: "terry1.k3s.internal" - domain: "home.sosnovsky.ca" Minisf1: ip: "10.0.11.3" host: "minisf1.k3s.internal" - domain: "home.sosnovsky.ca" Tnas1: ip: "10.0.11.4" host: "tnas1.k3s.internal" @@ -33,11 +31,9 @@ Hub: Castle: ip: "10.0.12.1" host: "castle.hub.internal" - domain: "castle.home.sosnovsky.ca" Basement: ip: "10.0.12.2" host: "basement.hub.internal" - domain: "basement.home.sosnovsky.ca" Flic: ip: "10.0.12.3" host: "flic.hub.internal" @@ -53,4 +49,24 @@ Cam: host: "doorbell.cam.internal" Livingroom: ip: "10.0.13.4" - host: "livingroom.cam.internal" \ No newline at end of file + host: "livingroom.cam.internal" +Iot: + Korie-lamp: + ip: "10.0.14.1" + host: "korie-lamp.iot.internal" + Office-strip: + ip: "10.0.14.2" + host: "office-strip.iot.internal" + Ecobee: + ip: "10.0.14.3" + host: "ecobee.iot.internal" + Apollo-eddie: + ip: "10.0.14.4" + host: "apollo-eddie.iot.internal" + Apollo-office: + ip: "10.0.14.5" + host: "apollo-office.iot.internal" +Apl: + Hp-print: + ip: "10.0.15.1" + host: "hp-print.apl.internal" \ No newline at end of file From 60e51f78ae594277c87401b77ddf36a5444356e3 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 8 Feb 2024 12:03:07 -0500 Subject: [PATCH 13/78] added vpn client --- os/raspberrypi2-raspbian/systemd/openvpn.service | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 os/raspberrypi2-raspbian/systemd/openvpn.service diff --git a/os/raspberrypi2-raspbian/systemd/openvpn.service b/os/raspberrypi2-raspbian/systemd/openvpn.service new file mode 100644 index 0000000..fd1cda0 --- /dev/null +++ b/os/raspberrypi2-raspbian/systemd/openvpn.service @@ -0,0 +1,16 @@ +[Unit] +Description=OpenVPN Client +After=network.target + +[Service] +Type=oneshot +Restart=on-failure +WorkingDirectory=/etc/openvpn +EnvironmentFile=/etc/openvpn/openvpn.service.env +ExecStart=/usr/sbin/openvpn --config \ + /etc/openvpn/nordvpn/${CONFIG_FILE} \ + --auth-user-pass ${AUTH_FILE} + + +[Install] +WantedBy=multi-user.target \ No newline at end of file From 0c5dc9d524e183d6daa39451d4b2064b69f4322f Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 8 Feb 2024 12:04:31 -0500 Subject: [PATCH 14/78] openvpn --- os/raspberrypi2-raspbian/helpers.sh | 5 +++++ .../systemd/{openvpn.service => openvpn-client.service} | 0 2 files changed, 5 insertions(+) rename os/raspberrypi2-raspbian/systemd/{openvpn.service => openvpn-client.service} (100%) diff --git a/os/raspberrypi2-raspbian/helpers.sh b/os/raspberrypi2-raspbian/helpers.sh index f6ffd06..37e4403 100755 --- a/os/raspberrypi2-raspbian/helpers.sh +++ b/os/raspberrypi2-raspbian/helpers.sh @@ -91,4 +91,9 @@ static_routers=$routerip static ip_address=$ip/24 # <---- AUTOGENERATED ---> " | tee -a /etc/dhcpcd.conf +} + +function install-openvpn { + sudo apt install openvpn + sudo cp systemd/openvpn.service /etc/systemd/system/openvpn-client.service } \ No newline at end of file diff --git a/os/raspberrypi2-raspbian/systemd/openvpn.service b/os/raspberrypi2-raspbian/systemd/openvpn-client.service similarity index 100% rename from os/raspberrypi2-raspbian/systemd/openvpn.service rename to os/raspberrypi2-raspbian/systemd/openvpn-client.service From 34682eca86a0c97899759606d9e9dfda033d4690 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 8 Feb 2024 12:08:17 -0500 Subject: [PATCH 15/78] Updated client --- os/raspberrypi2-raspbian/systemd/openvpn-client.service | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/os/raspberrypi2-raspbian/systemd/openvpn-client.service b/os/raspberrypi2-raspbian/systemd/openvpn-client.service index fd1cda0..70071b1 100644 --- a/os/raspberrypi2-raspbian/systemd/openvpn-client.service +++ b/os/raspberrypi2-raspbian/systemd/openvpn-client.service @@ -7,9 +7,9 @@ Type=oneshot Restart=on-failure WorkingDirectory=/etc/openvpn EnvironmentFile=/etc/openvpn/openvpn.service.env -ExecStart=/usr/sbin/openvpn --config \ - /etc/openvpn/nordvpn/${CONFIG_FILE} \ - --auth-user-pass ${AUTH_FILE} +ExecStart=/usr/sbin/openvpn \ + --config "${CONFIG_FILE}" \ + --auth-user-pass "${AUTH_FILE}" [Install] From 487075cba14205a21953da701360e319bd486404 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 8 Feb 2024 12:22:29 -0500 Subject: [PATCH 16/78] updated scripts --- os/raspberrypi2-raspbian/helpers.sh | 37 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/os/raspberrypi2-raspbian/helpers.sh b/os/raspberrypi2-raspbian/helpers.sh index 37e4403..9c6fc7f 100755 --- a/os/raspberrypi2-raspbian/helpers.sh +++ b/os/raspberrypi2-raspbian/helpers.sh @@ -1,17 +1,17 @@ #!/bin/sh -function update-os { +update_os() { # Updating sudo apt-get update -y sudo apt-get upgrade -y } -function remove-bad-package { +remove_bad_package() { for pkg in docker.io docker-doc docker-compose podman-docker containerd runc; do sudo apt-get remove $pkg; done sudo apt autoremove -y } -function instsall-core-package { +instsall_core_package() { sudo apt install -y \ git \ jq \ @@ -19,7 +19,7 @@ function instsall-core-package { sh <(curl -L https://nixos.org/nix/install) --daemon } -function install-docker { +install_docker() { echo "Add Docker's official GPG key..." sudo apt-get install ca-certificates curl gnupg sudo install -m 0755 -d /etc/apt/keyrings @@ -42,45 +42,44 @@ function install-docker { docker-compose-plugin } -function install-docker-compose-systemd { +install_docker_compose_systemd() { sudo mkdir -p /etc/docker/compose/ sudo cp systemd/docker-compose@.service /etc/systemd/system/docker-compose@.service } -function mount-nfs-torrents { +mount_nfs_torrents() { sudo cp /etc/fstab /etc/fstab.backup sudo mkdir -p /torrents sudo echo "truenas.local:/mnt/EightTerra/DownloadedTorrents /torrents/ nfs auto 0 0" | sudo tee -a /etc/fstab sudo mount -a } -function install-qbittorrent { +install_qbittorrent() { sudo useradd -r -m qbittorrent - sudo usermod -a -G qbittorrent $USER + sudo usermod -a -G qbittorrent "$USER" sudo apt install -y qbittorrent-nox sudo cp systemd/qbittorrent.service /etc/systemd/system/qbittorrent.service sudo systemctl start qbittorrent sudo systemctl enable qbittorrent } -function install-speedtest-cli { - mkdir -p $HOME/.local/bin - mkdir -p $HOME/tmp/speedtest - pushd $HOME/tmp/speedtest/ +install_speedtest_cli() { + mkdir -p "$HOME"/.local/bin + mkdir -p "$HOME"/tmp/speedtest + pushd "$HOME"/tmp/speedtest/ || exit 1 wget https://github.com/librespeed/speedtest-cli/releases/download/v1.0.10/librespeed-cli_1.0.10_linux_armv7.tar.gz tar -xvf librespeed-cli_1.0.10_linux_armv7.tar.gz - cp librespeed-cli $HOME/.local/bin/speedtest-cli - popd - rm -rf $HOME/tmp/speedtest + cp librespeed-cli "$HOME"/.local/bin/speedtest-cli + rm -rf "$HOME"/tmp/speedtest } -function install-transmission { +install_transmission() { sudo apt-get install transmission-daemon sudo ufw allow 9091,51413/tcp } -function set-static-ip() { +set_static_ip() { ip=${1} intf=${2:-eth0} routerip=${3:-192.168.8.1} @@ -93,7 +92,7 @@ static ip_address=$ip/24 " | tee -a /etc/dhcpcd.conf } -function install-openvpn { +install_openvpn() { sudo apt install openvpn - sudo cp systemd/openvpn.service /etc/systemd/system/openvpn-client.service + sudo cp systemd/openvpn-client.service /etc/systemd/system/openvpn-client.service } \ No newline at end of file From d11691aeba80bb29f8ef5eff0bcc02356430702f Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 9 Feb 2024 10:15:09 -0500 Subject: [PATCH 17/78] =?UTF-8?q?=F0=9F=A4=96=20Updated=20Router=20Config?= =?UTF-8?q?=20at=20Fri=20Feb=20=209=2010:15:09=20EST=202024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- os/routers/glmain/config.yaml | 10 ++++++++-- os/routers/glmain/output/etc/dnsmasq.conf | 10 ++++++++++ os/routers/glmain/output/summary.yaml | 11 +++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml index 649a94c..1699a83 100644 --- a/os/routers/glmain/config.yaml +++ b/os/routers/glmain/config.yaml @@ -23,10 +23,10 @@ k3s: hub: - mac: 'E4:5F:01:A2:8D:BC' name: 'castle' - # domain: castle.home.sosnovsky.ca + domain: castle.home.sosnovsky.ca - mac: 'DC:A6:32:92:B2:79' name: 'basement' - # domain: basement.home.sosnovsky.ca + domain: basement.home.sosnovsky.ca - mac: '4E:F6:9C:7C:56:33' name: 'flic' cam: @@ -49,6 +49,12 @@ iot: mac: '30:30:F9:DC:A8:18' - name: 'apollo-office' mac: '30:30:F9:DA:C7:A4' + - name: 'apollo-laundry' + mac: '30:30:F9:DC:BE:7C' + - name: 'epl-kitchen' + mac: '64:B7:08:28:52:50' + - name: 'epl-livingroom' + mac: '64:B7:08:28:56:F4' apl: - name: 'hp-print' mac: '48:9E:BD:CB:07:E3' \ No newline at end of file diff --git a/os/routers/glmain/output/etc/dnsmasq.conf b/os/routers/glmain/output/etc/dnsmasq.conf index fd46d03..98ee9a2 100644 --- a/os/routers/glmain/output/etc/dnsmasq.conf +++ b/os/routers/glmain/output/etc/dnsmasq.conf @@ -20,8 +20,12 @@ dhcp-host=00:A0:98:17:B2:64,K3sTnas1,10.0.11.4,infinite address=/tnas1.k3s.internal/10.0.11.4 dhcp-host=E4:5F:01:A2:8D:BC,HubCastle,10.0.12.1,infinite address=/castle.hub.internal/10.0.12.1 +address=/castle.home.sosnovsky.ca/10.0.12.1 +address=/.castle.home.sosnovsky.ca/10.0.12.1 dhcp-host=DC:A6:32:92:B2:79,HubBasement,10.0.12.2,infinite address=/basement.hub.internal/10.0.12.2 +address=/basement.home.sosnovsky.ca/10.0.12.2 +address=/.basement.home.sosnovsky.ca/10.0.12.2 dhcp-host=4E:F6:9C:7C:56:33,HubFlic,10.0.12.3,infinite address=/flic.hub.internal/10.0.12.3 dhcp-host=9C:8E:CD:25:83:1F,CamKorie,10.0.13.1,infinite @@ -42,5 +46,11 @@ dhcp-host=30:30:F9:DC:A8:18,IotApollo-eddie,10.0.14.4,infinite address=/apollo-eddie.iot.internal/10.0.14.4 dhcp-host=30:30:F9:DA:C7:A4,IotApollo-office,10.0.14.5,infinite address=/apollo-office.iot.internal/10.0.14.5 +dhcp-host=30:30:F9:DC:BE:7C,IotApollo-laundry,10.0.14.6,infinite +address=/apollo-laundry.iot.internal/10.0.14.6 +dhcp-host=64:B7:08:28:52:50,IotEpl-kitchen,10.0.14.7,infinite +address=/epl-kitchen.iot.internal/10.0.14.7 +dhcp-host=64:B7:08:28:56:F4,IotEpl-livingroom,10.0.14.8,infinite +address=/epl-livingroom.iot.internal/10.0.14.8 dhcp-host=48:9E:BD:CB:07:E3,AplHp-print,10.0.15.1,infinite address=/hp-print.apl.internal/10.0.15.1 diff --git a/os/routers/glmain/output/summary.yaml b/os/routers/glmain/output/summary.yaml index 317581f..ae41619 100644 --- a/os/routers/glmain/output/summary.yaml +++ b/os/routers/glmain/output/summary.yaml @@ -31,9 +31,11 @@ Hub: Castle: ip: "10.0.12.1" host: "castle.hub.internal" + domain: "castle.home.sosnovsky.ca" Basement: ip: "10.0.12.2" host: "basement.hub.internal" + domain: "basement.home.sosnovsky.ca" Flic: ip: "10.0.12.3" host: "flic.hub.internal" @@ -66,6 +68,15 @@ Iot: Apollo-office: ip: "10.0.14.5" host: "apollo-office.iot.internal" + Apollo-laundry: + ip: "10.0.14.6" + host: "apollo-laundry.iot.internal" + Epl-kitchen: + ip: "10.0.14.7" + host: "epl-kitchen.iot.internal" + Epl-livingroom: + ip: "10.0.14.8" + host: "epl-livingroom.iot.internal" Apl: Hp-print: ip: "10.0.15.1" From 51b203293dcb72f0c479a785678c0f2167015d9e Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 9 Feb 2024 10:29:17 -0500 Subject: [PATCH 18/78] =?UTF-8?q?=F0=9F=A4=96=20Updated=20Router=20Config?= =?UTF-8?q?=20at=20Fri=20Feb=20=209=2010:29:17=20EST=202024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- os/routers/glmain/gen-mappings.py | 10 +++- os/routers/glmain/output/etc/dnsmasq.conf | 16 ------- os/routers/glmain/output/etc/ethers | 58 +++++++++++++++++++++++ os/routers/glmain/push.sh | 3 +- 4 files changed, 68 insertions(+), 19 deletions(-) create mode 100644 os/routers/glmain/output/etc/ethers diff --git a/os/routers/glmain/gen-mappings.py b/os/routers/glmain/gen-mappings.py index 80418e2..fa8cab8 100755 --- a/os/routers/glmain/gen-mappings.py +++ b/os/routers/glmain/gen-mappings.py @@ -8,10 +8,12 @@ BASE_PATH = Path(__file__).parent CONFIG_FILE = BASE_PATH / "config.yaml" OUTPUT_FOLDER = BASE_PATH / "output" DNSMASQ_CONF = OUTPUT_FOLDER / "etc/dnsmasq.conf" +ETHERS = OUTPUT_FOLDER / "etc/ethers" SUMMARY = OUTPUT_FOLDER / "summary.yaml" shutil.rmtree(OUTPUT_FOLDER) DNSMASQ_CONF.parent.mkdir(exist_ok=True, parents=True) +ETHERS.parent.mkdir(exist_ok=True, parents=True) root_domain = "internal" ip_prefix_map = { @@ -33,10 +35,11 @@ def cap1_and_join(*args: str) -> str: with CONFIG_FILE.open('r') as fp: devices = yaml.safe_load(fp) -with DNSMASQ_CONF.open('w') as dfp, SUMMARY.open('w') as sfp: +with DNSMASQ_CONF.open('w') as dfp, SUMMARY.open('w') as sfp, ETHERS.open('w') as efp: for sub_domain, configs in devices.items(): ip_prefix = ip_prefix_map[sub_domain] sfp.write(f'\n{cap1_and_join(sub_domain)}:') + efp.write(f'#{cap1_and_join(sub_domain)}\n') for ip_suffix, dvc in enumerate(configs, start=1): mac = dvc['mac'] name = dvc['name'] @@ -47,7 +50,10 @@ with DNSMASQ_CONF.open('w') as dfp, SUMMARY.open('w') as sfp: sfp.write(f'\n host: "{host}"') dfp.write(f"dhcp-host={mac},{cap1_and_join(sub_domain, name)},{ip},infinite\n") dfp.write(f"address=/{host}/{ip}\n") + efp.write(f'{mac} {ip}\n') + efp.write(f'{mac} {host}\n') if domain := dvc.get('domain'): dfp.write(f"address=/{domain}/{ip}\n") dfp.write(f"address=/.{domain}/{ip}\n") - sfp.write(f'\n domain: "{domain}"') \ No newline at end of file + sfp.write(f'\n domain: "{domain}"') + efp.write(f'{mac} {domain}\n') \ No newline at end of file diff --git a/os/routers/glmain/output/etc/dnsmasq.conf b/os/routers/glmain/output/etc/dnsmasq.conf index 98ee9a2..edf142c 100644 --- a/os/routers/glmain/output/etc/dnsmasq.conf +++ b/os/routers/glmain/output/etc/dnsmasq.conf @@ -38,19 +38,3 @@ dhcp-host=34:60:F9:D7:51:3F,CamLivingroom,10.0.13.4,infinite address=/livingroom.cam.internal/10.0.13.4 dhcp-host=60:74:F4:4D:B8:C5,IotKorie-lamp,10.0.14.1,infinite address=/korie-lamp.iot.internal/10.0.14.1 -dhcp-host=DC:4F:22:24:0C:E4,IotOffice-strip,10.0.14.2,infinite -address=/office-strip.iot.internal/10.0.14.2 -dhcp-host=44:61:32:FC:10:EC,IotEcobee,10.0.14.3,infinite -address=/ecobee.iot.internal/10.0.14.3 -dhcp-host=30:30:F9:DC:A8:18,IotApollo-eddie,10.0.14.4,infinite -address=/apollo-eddie.iot.internal/10.0.14.4 -dhcp-host=30:30:F9:DA:C7:A4,IotApollo-office,10.0.14.5,infinite -address=/apollo-office.iot.internal/10.0.14.5 -dhcp-host=30:30:F9:DC:BE:7C,IotApollo-laundry,10.0.14.6,infinite -address=/apollo-laundry.iot.internal/10.0.14.6 -dhcp-host=64:B7:08:28:52:50,IotEpl-kitchen,10.0.14.7,infinite -address=/epl-kitchen.iot.internal/10.0.14.7 -dhcp-host=64:B7:08:28:56:F4,IotEpl-livingroom,10.0.14.8,infinite -address=/epl-livingroom.iot.internal/10.0.14.8 -dhcp-host=48:9E:BD:CB:07:E3,AplHp-print,10.0.15.1,infinite -address=/hp-print.apl.internal/10.0.15.1 diff --git a/os/routers/glmain/output/etc/ethers b/os/routers/glmain/output/etc/ethers new file mode 100644 index 0000000..562885e --- /dev/null +++ b/os/routers/glmain/output/etc/ethers @@ -0,0 +1,58 @@ +#Lab +3C:7C:3F:1E:B7:A0 10.0.10.1 +3C:7C:3F:1E:B7:A0 tnas1.lab.internal +3C:7C:3F:1E:B7:A0 tnas1.lab.local +00:A0:98:3D:7C:C8 10.0.10.2 +00:A0:98:3D:7C:C8 kubedb.lab.internal +B8:27:EB:F7:44:4E 10.0.10.3 +B8:27:EB:F7:44:4E pi1.lab.internal +9C:BF:0D:00:56:51 10.0.10.4 +9C:BF:0D:00:56:51 fws1.lab.internal +#K3s +7C:83:34:B8:7B:43 10.0.11.1 +7C:83:34:B8:7B:43 bee1.k3s.internal +7C:83:34:B8:7B:43 home.sosnovsky.ca +68:1D:EF:26:B7:6C 10.0.11.2 +68:1D:EF:26:B7:6C terry1.k3s.internal +58:47:CA:71:D8:E6 10.0.11.3 +58:47:CA:71:D8:E6 minisf1.k3s.internal +00:A0:98:17:B2:64 10.0.11.4 +00:A0:98:17:B2:64 tnas1.k3s.internal +#Hub +E4:5F:01:A2:8D:BC 10.0.12.1 +E4:5F:01:A2:8D:BC castle.hub.internal +E4:5F:01:A2:8D:BC castle.home.sosnovsky.ca +DC:A6:32:92:B2:79 10.0.12.2 +DC:A6:32:92:B2:79 basement.hub.internal +DC:A6:32:92:B2:79 basement.home.sosnovsky.ca +4E:F6:9C:7C:56:33 10.0.12.3 +4E:F6:9C:7C:56:33 flic.hub.internal +#Cam +9C:8E:CD:25:83:1F 10.0.13.1 +9C:8E:CD:25:83:1F korie.cam.internal +A0:60:32:03:86:8A 10.0.13.2 +A0:60:32:03:86:8A eddie.cam.internal +48:9E:9D:4A:32:80 10.0.13.3 +48:9E:9D:4A:32:80 doorbell.cam.internal +34:60:F9:D7:51:3F 10.0.13.4 +34:60:F9:D7:51:3F livingroom.cam.internal +#Iot +60:74:F4:4D:B8:C5 10.0.14.1 +60:74:F4:4D:B8:C5 korie-lamp.iot.internal +DC:4F:22:24:0C:E4 10.0.14.2 +DC:4F:22:24:0C:E4 office-strip.iot.internal +44:61:32:FC:10:EC 10.0.14.3 +44:61:32:FC:10:EC ecobee.iot.internal +30:30:F9:DC:A8:18 10.0.14.4 +30:30:F9:DC:A8:18 apollo-eddie.iot.internal +30:30:F9:DA:C7:A4 10.0.14.5 +30:30:F9:DA:C7:A4 apollo-office.iot.internal +30:30:F9:DC:BE:7C 10.0.14.6 +30:30:F9:DC:BE:7C apollo-laundry.iot.internal +64:B7:08:28:52:50 10.0.14.7 +64:B7:08:28:52:50 epl-kitchen.iot.internal +64:B7:08:28:56:F4 10.0.14.8 +64:B7:08:28:56:F4 epl-livingroom.iot.internal +#Apl +48:9E:BD:CB:07:E3 10.0.15.1 +48:9E:BD:CB:07:E3 hp-print.apl.internal diff --git a/os/routers/glmain/push.sh b/os/routers/glmain/push.sh index 24665be..f03c65f 100755 --- a/os/routers/glmain/push.sh +++ b/os/routers/glmain/push.sh @@ -26,11 +26,12 @@ echo "using 🤖 $server" ask "continue update" echo "Updating conf..." -./gen-mappings.py +# ./gen-mappings.py cat output/summary.yaml ask "continue update" scp -O output/etc/dnsmasq.conf "$server:/tmp/dnsmasq.new.conf" +scp -O output/etc/ethers "$server:/etc/ethers" ssh "$server" << EOF echo 'Backing up dnsmasq.conf file to /tmp/dnsmasq.old.conf' cp /etc/dnsmasq.conf /tmp/dnsmasq.old.conf From ceab979e066dc554db107b4c219e2d7e733c97d0 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 9 Feb 2024 10:37:21 -0500 Subject: [PATCH 19/78] =?UTF-8?q?=F0=9F=A4=96=20Updated=20Router=20Config?= =?UTF-8?q?=20at=20Fri=20Feb=20=209=2010:37:21=20EST=202024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- os/routers/glmain/config.yaml | 16 ++++++++++- os/routers/glmain/output/etc/dnsmasq.conf | 30 ++++++++++++++++++++ os/routers/glmain/output/etc/ethers | 14 ++++++++++ os/routers/glmain/output/summary.yaml | 23 ++++++++++++++- os/routers/glmain/push.sh | 34 +++++++++++------------ 5 files changed, 98 insertions(+), 19 deletions(-) diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml index 1699a83..f702ca8 100644 --- a/os/routers/glmain/config.yaml +++ b/os/routers/glmain/config.yaml @@ -55,6 +55,20 @@ iot: mac: '64:B7:08:28:52:50' - name: 'epl-livingroom' mac: '64:B7:08:28:56:F4' + - name: 'shelly-basement-living' + mac: 'B8:D6:1A:8A:5F:F4' + - name: 'shelly-basement-shared' + mac: 'B8:D6:1A:8C:4C:DC' + - name: 'shelly-laundry-light' + mac: 'C8:2B:96:1D:DA:B4' apl: - name: 'hp-print' - mac: '48:9E:BD:CB:07:E3' \ No newline at end of file + mac: '48:9E:BD:CB:07:E3' + - name: 'gm-eddie' + mac: '20:DF:B9:71:55:9C' + - name: 'myq-garage' + mac: 'CC:6A:10:8B:7D:D3' + - name: 'pod-korie' + mac: '04:99:B9:86:2D:AE' + - name: 'pod-livingroom' + mac: '04:99:B9:88:ED:3B' \ No newline at end of file diff --git a/os/routers/glmain/output/etc/dnsmasq.conf b/os/routers/glmain/output/etc/dnsmasq.conf index edf142c..1b85bdd 100644 --- a/os/routers/glmain/output/etc/dnsmasq.conf +++ b/os/routers/glmain/output/etc/dnsmasq.conf @@ -38,3 +38,33 @@ dhcp-host=34:60:F9:D7:51:3F,CamLivingroom,10.0.13.4,infinite address=/livingroom.cam.internal/10.0.13.4 dhcp-host=60:74:F4:4D:B8:C5,IotKorie-lamp,10.0.14.1,infinite address=/korie-lamp.iot.internal/10.0.14.1 +dhcp-host=DC:4F:22:24:0C:E4,IotOffice-strip,10.0.14.2,infinite +address=/office-strip.iot.internal/10.0.14.2 +dhcp-host=44:61:32:FC:10:EC,IotEcobee,10.0.14.3,infinite +address=/ecobee.iot.internal/10.0.14.3 +dhcp-host=30:30:F9:DC:A8:18,IotApollo-eddie,10.0.14.4,infinite +address=/apollo-eddie.iot.internal/10.0.14.4 +dhcp-host=30:30:F9:DA:C7:A4,IotApollo-office,10.0.14.5,infinite +address=/apollo-office.iot.internal/10.0.14.5 +dhcp-host=30:30:F9:DC:BE:7C,IotApollo-laundry,10.0.14.6,infinite +address=/apollo-laundry.iot.internal/10.0.14.6 +dhcp-host=64:B7:08:28:52:50,IotEpl-kitchen,10.0.14.7,infinite +address=/epl-kitchen.iot.internal/10.0.14.7 +dhcp-host=64:B7:08:28:56:F4,IotEpl-livingroom,10.0.14.8,infinite +address=/epl-livingroom.iot.internal/10.0.14.8 +dhcp-host=B8:D6:1A:8A:5F:F4,IotShelly-basement-living,10.0.14.9,infinite +address=/shelly-basement-living.iot.internal/10.0.14.9 +dhcp-host=B8:D6:1A:8C:4C:DC,IotShelly-basement-shared,10.0.14.10,infinite +address=/shelly-basement-shared.iot.internal/10.0.14.10 +dhcp-host=C8:2B:96:1D:DA:B4,IotShelly-laundry-light,10.0.14.11,infinite +address=/shelly-laundry-light.iot.internal/10.0.14.11 +dhcp-host=48:9E:BD:CB:07:E3,AplHp-print,10.0.15.1,infinite +address=/hp-print.apl.internal/10.0.15.1 +dhcp-host=20:DF:B9:71:55:9C,AplGm-eddie,10.0.15.2,infinite +address=/gm-eddie.apl.internal/10.0.15.2 +dhcp-host=CC:6A:10:8B:7D:D3,AplMyq-garage,10.0.15.3,infinite +address=/myq-garage.apl.internal/10.0.15.3 +dhcp-host=04:99:B9:86:2D:AE,AplPod-korie,10.0.15.4,infinite +address=/pod-korie.apl.internal/10.0.15.4 +dhcp-host=04:99:B9:88:ED:3B,AplPod-livingroom,10.0.15.5,infinite +address=/pod-livingroom.apl.internal/10.0.15.5 diff --git a/os/routers/glmain/output/etc/ethers b/os/routers/glmain/output/etc/ethers index 562885e..820094d 100644 --- a/os/routers/glmain/output/etc/ethers +++ b/os/routers/glmain/output/etc/ethers @@ -53,6 +53,20 @@ DC:4F:22:24:0C:E4 office-strip.iot.internal 64:B7:08:28:52:50 epl-kitchen.iot.internal 64:B7:08:28:56:F4 10.0.14.8 64:B7:08:28:56:F4 epl-livingroom.iot.internal +B8:D6:1A:8A:5F:F4 10.0.14.9 +B8:D6:1A:8A:5F:F4 shelly-basement-living.iot.internal +B8:D6:1A:8C:4C:DC 10.0.14.10 +B8:D6:1A:8C:4C:DC shelly-basement-shared.iot.internal +C8:2B:96:1D:DA:B4 10.0.14.11 +C8:2B:96:1D:DA:B4 shelly-laundry-light.iot.internal #Apl 48:9E:BD:CB:07:E3 10.0.15.1 48:9E:BD:CB:07:E3 hp-print.apl.internal +20:DF:B9:71:55:9C 10.0.15.2 +20:DF:B9:71:55:9C gm-eddie.apl.internal +CC:6A:10:8B:7D:D3 10.0.15.3 +CC:6A:10:8B:7D:D3 myq-garage.apl.internal +04:99:B9:86:2D:AE 10.0.15.4 +04:99:B9:86:2D:AE pod-korie.apl.internal +04:99:B9:88:ED:3B 10.0.15.5 +04:99:B9:88:ED:3B pod-livingroom.apl.internal diff --git a/os/routers/glmain/output/summary.yaml b/os/routers/glmain/output/summary.yaml index ae41619..5e6eb7d 100644 --- a/os/routers/glmain/output/summary.yaml +++ b/os/routers/glmain/output/summary.yaml @@ -77,7 +77,28 @@ Iot: Epl-livingroom: ip: "10.0.14.8" host: "epl-livingroom.iot.internal" + Shelly-basement-living: + ip: "10.0.14.9" + host: "shelly-basement-living.iot.internal" + Shelly-basement-shared: + ip: "10.0.14.10" + host: "shelly-basement-shared.iot.internal" + Shelly-laundry-light: + ip: "10.0.14.11" + host: "shelly-laundry-light.iot.internal" Apl: Hp-print: ip: "10.0.15.1" - host: "hp-print.apl.internal" \ No newline at end of file + host: "hp-print.apl.internal" + Gm-eddie: + ip: "10.0.15.2" + host: "gm-eddie.apl.internal" + Myq-garage: + ip: "10.0.15.3" + host: "myq-garage.apl.internal" + Pod-korie: + ip: "10.0.15.4" + host: "pod-korie.apl.internal" + Pod-livingroom: + ip: "10.0.15.5" + host: "pod-livingroom.apl.internal" \ No newline at end of file diff --git a/os/routers/glmain/push.sh b/os/routers/glmain/push.sh index f03c65f..2ab5c62 100755 --- a/os/routers/glmain/push.sh +++ b/os/routers/glmain/push.sh @@ -26,27 +26,27 @@ echo "using 🤖 $server" ask "continue update" echo "Updating conf..." -# ./gen-mappings.py +./gen-mappings.py cat output/summary.yaml ask "continue update" -scp -O output/etc/dnsmasq.conf "$server:/tmp/dnsmasq.new.conf" +# scp -O output/etc/dnsmasq.conf "$server:/tmp/dnsmasq.new.conf" scp -O output/etc/ethers "$server:/etc/ethers" -ssh "$server" << EOF -echo 'Backing up dnsmasq.conf file to /tmp/dnsmasq.old.conf' -cp /etc/dnsmasq.conf /tmp/dnsmasq.old.conf -echo 'Updating dnsmasq.conf 🙇🏼' -cp /tmp/dnsmasq.new.conf /etc/dnsmasq.conf -if dnsmasq --test ; then - /etc/init.d/dnsmasq restart -else - echo "Updated Failed! 🚨" - echo "Attempting to revert back..." - cp /tmp/dnsmasq.old.conf /etc/dnsmasq.conf - dnsmasq --test - echo "Revert successful! 👍" -fi -EOF +# ssh "$server" << EOF +# echo 'Backing up dnsmasq.conf file to /tmp/dnsmasq.old.conf' +# cp /etc/dnsmasq.conf /tmp/dnsmasq.old.conf +# echo 'Updating dnsmasq.conf 🙇🏼' +# cp /tmp/dnsmasq.new.conf /etc/dnsmasq.conf +# if dnsmasq --test ; then +# /etc/init.d/dnsmasq restart +# else +# echo "Updated Failed! 🚨" +# echo "Attempting to revert back..." +# # cp /tmp/dnsmasq.old.conf /etc/dnsmasq.conf +# dnsmasq --test +# echo "Revert successful! 👍" +# fi +# EOF git add . git commit -m "🤖 Updated Router Config at $(date)" From 1c2e75226d2e1aab0a3a68600611d089d6d9787d Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 9 Feb 2024 11:18:50 -0500 Subject: [PATCH 20/78] =?UTF-8?q?=F0=9F=A4=96=20Updated=20Router=20Config?= =?UTF-8?q?=20at=20Fri=20Feb=20=209=2011:18:49=20EST=202024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- os/routers/glmain/gen-mappings.py | 6 +-- os/routers/glmain/output/etc/dnsmasq.conf | 62 ----------------------- os/routers/glmain/output/etc/ethers | 4 -- os/routers/glmain/push.sh | 32 ++++++------ 4 files changed, 19 insertions(+), 85 deletions(-) diff --git a/os/routers/glmain/gen-mappings.py b/os/routers/glmain/gen-mappings.py index fa8cab8..0c8eb69 100755 --- a/os/routers/glmain/gen-mappings.py +++ b/os/routers/glmain/gen-mappings.py @@ -48,12 +48,12 @@ with DNSMASQ_CONF.open('w') as dfp, SUMMARY.open('w') as sfp, ETHERS.open('w') a host = f"{name}.{sub_domain}.{root_domain}" sfp.write(f'\n ip: "{ip}"') sfp.write(f'\n host: "{host}"') - dfp.write(f"dhcp-host={mac},{cap1_and_join(sub_domain, name)},{ip},infinite\n") - dfp.write(f"address=/{host}/{ip}\n") + # dfp.write(f"dhcp-host={mac},{cap1_and_join(sub_domain, name)},{ip},infinite\n") + # dfp.write(f"address=/{host}/{ip}\n") efp.write(f'{mac} {ip}\n') efp.write(f'{mac} {host}\n') if domain := dvc.get('domain'): dfp.write(f"address=/{domain}/{ip}\n") dfp.write(f"address=/.{domain}/{ip}\n") sfp.write(f'\n domain: "{domain}"') - efp.write(f'{mac} {domain}\n') \ No newline at end of file + # efp.write(f'{mac} {domain}\n') \ No newline at end of file diff --git a/os/routers/glmain/output/etc/dnsmasq.conf b/os/routers/glmain/output/etc/dnsmasq.conf index 1b85bdd..224301d 100644 --- a/os/routers/glmain/output/etc/dnsmasq.conf +++ b/os/routers/glmain/output/etc/dnsmasq.conf @@ -1,70 +1,8 @@ -dhcp-host=3C:7C:3F:1E:B7:A0,LabTnas1,10.0.10.1,infinite -address=/tnas1.lab.internal/10.0.10.1 address=/tnas1.lab.local/10.0.10.1 address=/.tnas1.lab.local/10.0.10.1 -dhcp-host=00:A0:98:3D:7C:C8,LabKubedb,10.0.10.2,infinite -address=/kubedb.lab.internal/10.0.10.2 -dhcp-host=B8:27:EB:F7:44:4E,LabPi1,10.0.10.3,infinite -address=/pi1.lab.internal/10.0.10.3 -dhcp-host=9C:BF:0D:00:56:51,LabFws1,10.0.10.4,infinite -address=/fws1.lab.internal/10.0.10.4 -dhcp-host=7C:83:34:B8:7B:43,K3sBee1,10.0.11.1,infinite -address=/bee1.k3s.internal/10.0.11.1 address=/home.sosnovsky.ca/10.0.11.1 address=/.home.sosnovsky.ca/10.0.11.1 -dhcp-host=68:1D:EF:26:B7:6C,K3sTerry1,10.0.11.2,infinite -address=/terry1.k3s.internal/10.0.11.2 -dhcp-host=58:47:CA:71:D8:E6,K3sMinisf1,10.0.11.3,infinite -address=/minisf1.k3s.internal/10.0.11.3 -dhcp-host=00:A0:98:17:B2:64,K3sTnas1,10.0.11.4,infinite -address=/tnas1.k3s.internal/10.0.11.4 -dhcp-host=E4:5F:01:A2:8D:BC,HubCastle,10.0.12.1,infinite -address=/castle.hub.internal/10.0.12.1 address=/castle.home.sosnovsky.ca/10.0.12.1 address=/.castle.home.sosnovsky.ca/10.0.12.1 -dhcp-host=DC:A6:32:92:B2:79,HubBasement,10.0.12.2,infinite -address=/basement.hub.internal/10.0.12.2 address=/basement.home.sosnovsky.ca/10.0.12.2 address=/.basement.home.sosnovsky.ca/10.0.12.2 -dhcp-host=4E:F6:9C:7C:56:33,HubFlic,10.0.12.3,infinite -address=/flic.hub.internal/10.0.12.3 -dhcp-host=9C:8E:CD:25:83:1F,CamKorie,10.0.13.1,infinite -address=/korie.cam.internal/10.0.13.1 -dhcp-host=A0:60:32:03:86:8A,CamEddie,10.0.13.2,infinite -address=/eddie.cam.internal/10.0.13.2 -dhcp-host=48:9E:9D:4A:32:80,CamDoorbell,10.0.13.3,infinite -address=/doorbell.cam.internal/10.0.13.3 -dhcp-host=34:60:F9:D7:51:3F,CamLivingroom,10.0.13.4,infinite -address=/livingroom.cam.internal/10.0.13.4 -dhcp-host=60:74:F4:4D:B8:C5,IotKorie-lamp,10.0.14.1,infinite -address=/korie-lamp.iot.internal/10.0.14.1 -dhcp-host=DC:4F:22:24:0C:E4,IotOffice-strip,10.0.14.2,infinite -address=/office-strip.iot.internal/10.0.14.2 -dhcp-host=44:61:32:FC:10:EC,IotEcobee,10.0.14.3,infinite -address=/ecobee.iot.internal/10.0.14.3 -dhcp-host=30:30:F9:DC:A8:18,IotApollo-eddie,10.0.14.4,infinite -address=/apollo-eddie.iot.internal/10.0.14.4 -dhcp-host=30:30:F9:DA:C7:A4,IotApollo-office,10.0.14.5,infinite -address=/apollo-office.iot.internal/10.0.14.5 -dhcp-host=30:30:F9:DC:BE:7C,IotApollo-laundry,10.0.14.6,infinite -address=/apollo-laundry.iot.internal/10.0.14.6 -dhcp-host=64:B7:08:28:52:50,IotEpl-kitchen,10.0.14.7,infinite -address=/epl-kitchen.iot.internal/10.0.14.7 -dhcp-host=64:B7:08:28:56:F4,IotEpl-livingroom,10.0.14.8,infinite -address=/epl-livingroom.iot.internal/10.0.14.8 -dhcp-host=B8:D6:1A:8A:5F:F4,IotShelly-basement-living,10.0.14.9,infinite -address=/shelly-basement-living.iot.internal/10.0.14.9 -dhcp-host=B8:D6:1A:8C:4C:DC,IotShelly-basement-shared,10.0.14.10,infinite -address=/shelly-basement-shared.iot.internal/10.0.14.10 -dhcp-host=C8:2B:96:1D:DA:B4,IotShelly-laundry-light,10.0.14.11,infinite -address=/shelly-laundry-light.iot.internal/10.0.14.11 -dhcp-host=48:9E:BD:CB:07:E3,AplHp-print,10.0.15.1,infinite -address=/hp-print.apl.internal/10.0.15.1 -dhcp-host=20:DF:B9:71:55:9C,AplGm-eddie,10.0.15.2,infinite -address=/gm-eddie.apl.internal/10.0.15.2 -dhcp-host=CC:6A:10:8B:7D:D3,AplMyq-garage,10.0.15.3,infinite -address=/myq-garage.apl.internal/10.0.15.3 -dhcp-host=04:99:B9:86:2D:AE,AplPod-korie,10.0.15.4,infinite -address=/pod-korie.apl.internal/10.0.15.4 -dhcp-host=04:99:B9:88:ED:3B,AplPod-livingroom,10.0.15.5,infinite -address=/pod-livingroom.apl.internal/10.0.15.5 diff --git a/os/routers/glmain/output/etc/ethers b/os/routers/glmain/output/etc/ethers index 820094d..ba3bf55 100644 --- a/os/routers/glmain/output/etc/ethers +++ b/os/routers/glmain/output/etc/ethers @@ -1,7 +1,6 @@ #Lab 3C:7C:3F:1E:B7:A0 10.0.10.1 3C:7C:3F:1E:B7:A0 tnas1.lab.internal -3C:7C:3F:1E:B7:A0 tnas1.lab.local 00:A0:98:3D:7C:C8 10.0.10.2 00:A0:98:3D:7C:C8 kubedb.lab.internal B8:27:EB:F7:44:4E 10.0.10.3 @@ -11,7 +10,6 @@ B8:27:EB:F7:44:4E pi1.lab.internal #K3s 7C:83:34:B8:7B:43 10.0.11.1 7C:83:34:B8:7B:43 bee1.k3s.internal -7C:83:34:B8:7B:43 home.sosnovsky.ca 68:1D:EF:26:B7:6C 10.0.11.2 68:1D:EF:26:B7:6C terry1.k3s.internal 58:47:CA:71:D8:E6 10.0.11.3 @@ -21,10 +19,8 @@ B8:27:EB:F7:44:4E pi1.lab.internal #Hub E4:5F:01:A2:8D:BC 10.0.12.1 E4:5F:01:A2:8D:BC castle.hub.internal -E4:5F:01:A2:8D:BC castle.home.sosnovsky.ca DC:A6:32:92:B2:79 10.0.12.2 DC:A6:32:92:B2:79 basement.hub.internal -DC:A6:32:92:B2:79 basement.home.sosnovsky.ca 4E:F6:9C:7C:56:33 10.0.12.3 4E:F6:9C:7C:56:33 flic.hub.internal #Cam diff --git a/os/routers/glmain/push.sh b/os/routers/glmain/push.sh index 2ab5c62..34305ed 100755 --- a/os/routers/glmain/push.sh +++ b/os/routers/glmain/push.sh @@ -30,23 +30,23 @@ echo "Updating conf..." cat output/summary.yaml ask "continue update" -# scp -O output/etc/dnsmasq.conf "$server:/tmp/dnsmasq.new.conf" +scp -O output/etc/dnsmasq.conf "$server:/tmp/dnsmasq.new.conf" scp -O output/etc/ethers "$server:/etc/ethers" -# ssh "$server" << EOF -# echo 'Backing up dnsmasq.conf file to /tmp/dnsmasq.old.conf' -# cp /etc/dnsmasq.conf /tmp/dnsmasq.old.conf -# echo 'Updating dnsmasq.conf 🙇🏼' -# cp /tmp/dnsmasq.new.conf /etc/dnsmasq.conf -# if dnsmasq --test ; then -# /etc/init.d/dnsmasq restart -# else -# echo "Updated Failed! 🚨" -# echo "Attempting to revert back..." -# # cp /tmp/dnsmasq.old.conf /etc/dnsmasq.conf -# dnsmasq --test -# echo "Revert successful! 👍" -# fi -# EOF +ssh "$server" << EOF +echo 'Backing up dnsmasq.conf file to /tmp/dnsmasq.old.conf' +cp /etc/dnsmasq.conf /tmp/dnsmasq.old.conf +echo 'Updating dnsmasq.conf 🙇🏼' +cp /tmp/dnsmasq.new.conf /etc/dnsmasq.conf +if dnsmasq --test ; then + /etc/init.d/dnsmasq restart +else + echo "Updated Failed! 🚨" + echo "Attempting to revert back..." + cp /tmp/dnsmasq.old.conf /etc/dnsmasq.conf + dnsmasq --test + echo "Revert successful! 👍" +fi +EOF git add . git commit -m "🤖 Updated Router Config at $(date)" From 0d5fc339fb78f47be65116e57953958c66ff4f9f Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 9 Feb 2024 11:53:24 -0500 Subject: [PATCH 21/78] homepage update --- k8s/argoapps/chart-values/homepage.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/k8s/argoapps/chart-values/homepage.yaml b/k8s/argoapps/chart-values/homepage.yaml index bb585bb..96f4563 100644 --- a/k8s/argoapps/chart-values/homepage.yaml +++ b/k8s/argoapps/chart-values/homepage.yaml @@ -1,3 +1,6 @@ +image: + repository: ghcr.io/gethomepage/homepage + tag: latest config: widgets: - kubernetes: From 078d73dbbf5b2f8f85181dc1729840a5d41cbee6 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 9 Feb 2024 11:55:05 -0500 Subject: [PATCH 22/78] moved image def --- k8s/argoapps/chart-values/homepage.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/k8s/argoapps/chart-values/homepage.yaml b/k8s/argoapps/chart-values/homepage.yaml index 96f4563..6128abb 100644 --- a/k8s/argoapps/chart-values/homepage.yaml +++ b/k8s/argoapps/chart-values/homepage.yaml @@ -40,6 +40,3 @@ serviceAccount: name: homepage enableRbac: true - -image: - tag: v0.7.1 \ No newline at end of file From 591c5b7fe414cdced4d438296d8f3a79da70ce6c Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 9 Feb 2024 15:45:11 -0500 Subject: [PATCH 23/78] =?UTF-8?q?=F0=9F=A4=96=20Updated=20Router=20Config?= =?UTF-8?q?=20at=20Fri=20Feb=20=209=2015:45:11=20EST=202024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- os/routers/glmain/config.yaml | 7 ++++++- os/routers/glmain/output/etc/ethers | 2 ++ os/routers/glmain/output/summary.yaml | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml index f702ca8..312a747 100644 --- a/os/routers/glmain/config.yaml +++ b/os/routers/glmain/config.yaml @@ -38,6 +38,8 @@ cam: mac: '48:9E:9D:4A:32:80' - name: 'livingroom' mac: '34:60:F9:D7:51:3F' + - name: 'garage' + mac: '' iot: - name: 'korie-lamp' mac: '60:74:F4:4D:B8:C5' @@ -71,4 +73,7 @@ apl: - name: 'pod-korie' mac: '04:99:B9:86:2D:AE' - name: 'pod-livingroom' - mac: '04:99:B9:88:ED:3B' \ No newline at end of file + mac: '04:99:B9:88:ED:3B' +routers: + - name: 'velica1-office' + mac: '94:83:C4:41:77:BA' diff --git a/os/routers/glmain/output/etc/ethers b/os/routers/glmain/output/etc/ethers index ba3bf55..167832d 100644 --- a/os/routers/glmain/output/etc/ethers +++ b/os/routers/glmain/output/etc/ethers @@ -32,6 +32,8 @@ A0:60:32:03:86:8A eddie.cam.internal 48:9E:9D:4A:32:80 doorbell.cam.internal 34:60:F9:D7:51:3F 10.0.13.4 34:60:F9:D7:51:3F livingroom.cam.internal + 10.0.13.5 + garage.cam.internal #Iot 60:74:F4:4D:B8:C5 10.0.14.1 60:74:F4:4D:B8:C5 korie-lamp.iot.internal diff --git a/os/routers/glmain/output/summary.yaml b/os/routers/glmain/output/summary.yaml index 5e6eb7d..1ec13bc 100644 --- a/os/routers/glmain/output/summary.yaml +++ b/os/routers/glmain/output/summary.yaml @@ -52,6 +52,9 @@ Cam: Livingroom: ip: "10.0.13.4" host: "livingroom.cam.internal" + Garage: + ip: "10.0.13.5" + host: "garage.cam.internal" Iot: Korie-lamp: ip: "10.0.14.1" From 2a60947fc432f31b0e36d63929d0bb8cb48d74c5 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 9 Feb 2024 15:51:48 -0500 Subject: [PATCH 24/78] =?UTF-8?q?=F0=9F=A4=96=20Updated=20Router=20Config?= =?UTF-8?q?=20at=20Fri=20Feb=20=209=2015:51:48=20EST=202024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- os/routers/glmain/config.yaml | 6 ++++-- os/routers/glmain/gen-mappings.py | 3 ++- os/routers/glmain/output/etc/ethers | 5 +++++ os/routers/glmain/output/summary.yaml | 9 ++++++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml index 312a747..e85c670 100644 --- a/os/routers/glmain/config.yaml +++ b/os/routers/glmain/config.yaml @@ -74,6 +74,8 @@ apl: mac: '04:99:B9:86:2D:AE' - name: 'pod-livingroom' mac: '04:99:B9:88:ED:3B' -routers: - - name: 'velica1-office' +router: + - name: 'velica-office' mac: '94:83:C4:41:77:BA' + - name: 'gl-basement' + mac: '94:83:C4:31:D5:CE' diff --git a/os/routers/glmain/gen-mappings.py b/os/routers/glmain/gen-mappings.py index 0c8eb69..70de256 100755 --- a/os/routers/glmain/gen-mappings.py +++ b/os/routers/glmain/gen-mappings.py @@ -22,7 +22,8 @@ ip_prefix_map = { "hub": "10.0.12.", "cam": "10.0.13.", "iot": "10.0.14.", - "apl": "10.0.15." + "apl": "10.0.15.", + "router": "10.0.16.", } def cap1_and_join(*args: str) -> str: diff --git a/os/routers/glmain/output/etc/ethers b/os/routers/glmain/output/etc/ethers index 167832d..9421286 100644 --- a/os/routers/glmain/output/etc/ethers +++ b/os/routers/glmain/output/etc/ethers @@ -68,3 +68,8 @@ CC:6A:10:8B:7D:D3 myq-garage.apl.internal 04:99:B9:86:2D:AE pod-korie.apl.internal 04:99:B9:88:ED:3B 10.0.15.5 04:99:B9:88:ED:3B pod-livingroom.apl.internal +#Router +94:83:C4:41:77:BA 10.0.16.1 +94:83:C4:41:77:BA velica-office.router.internal +94:83:C4:31:D5:CE 10.0.16.2 +94:83:C4:31:D5:CE gl-basement.router.internal diff --git a/os/routers/glmain/output/summary.yaml b/os/routers/glmain/output/summary.yaml index 1ec13bc..3af12b2 100644 --- a/os/routers/glmain/output/summary.yaml +++ b/os/routers/glmain/output/summary.yaml @@ -104,4 +104,11 @@ Apl: host: "pod-korie.apl.internal" Pod-livingroom: ip: "10.0.15.5" - host: "pod-livingroom.apl.internal" \ No newline at end of file + host: "pod-livingroom.apl.internal" +Router: + Velica-office: + ip: "10.0.16.1" + host: "velica-office.router.internal" + Gl-basement: + ip: "10.0.16.2" + host: "gl-basement.router.internal" \ No newline at end of file From 7a893db43849f8ea967591d43197d44cc5189b9f Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 9 Feb 2024 16:57:56 -0500 Subject: [PATCH 25/78] =?UTF-8?q?=F0=9F=A4=96=20Updated=20Router=20Config?= =?UTF-8?q?=20at=20Fri=20Feb=20=209=2016:57:56=20EST=202024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- os/routers/glmain/config.yaml | 9 ++++----- os/routers/glmain/output/etc/ethers | 9 ++++----- os/routers/glmain/output/summary.yaml | 13 ++++++------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml index e85c670..8df090e 100644 --- a/os/routers/glmain/config.yaml +++ b/os/routers/glmain/config.yaml @@ -74,8 +74,7 @@ apl: mac: '04:99:B9:86:2D:AE' - name: 'pod-livingroom' mac: '04:99:B9:88:ED:3B' -router: - - name: 'velica-office' - mac: '94:83:C4:41:77:BA' - - name: 'gl-basement' - mac: '94:83:C4:31:D5:CE' + - name: 'appletv-livingroom' + mac: '48:E1:5C:5B:CB:A3' + - name: 'samsuntv-livingroom' + mac: 'F0:70:4F:54:F3:F0' diff --git a/os/routers/glmain/output/etc/ethers b/os/routers/glmain/output/etc/ethers index 9421286..cece672 100644 --- a/os/routers/glmain/output/etc/ethers +++ b/os/routers/glmain/output/etc/ethers @@ -68,8 +68,7 @@ CC:6A:10:8B:7D:D3 myq-garage.apl.internal 04:99:B9:86:2D:AE pod-korie.apl.internal 04:99:B9:88:ED:3B 10.0.15.5 04:99:B9:88:ED:3B pod-livingroom.apl.internal -#Router -94:83:C4:41:77:BA 10.0.16.1 -94:83:C4:41:77:BA velica-office.router.internal -94:83:C4:31:D5:CE 10.0.16.2 -94:83:C4:31:D5:CE gl-basement.router.internal +48:E1:5C:5B:CB:A3 10.0.15.6 +48:E1:5C:5B:CB:A3 appletv-livingroom.apl.internal +F0:70:4F:54:F3:F0 10.0.15.7 +F0:70:4F:54:F3:F0 samsuntv-livingroom.apl.internal diff --git a/os/routers/glmain/output/summary.yaml b/os/routers/glmain/output/summary.yaml index 3af12b2..0f4f4e9 100644 --- a/os/routers/glmain/output/summary.yaml +++ b/os/routers/glmain/output/summary.yaml @@ -105,10 +105,9 @@ Apl: Pod-livingroom: ip: "10.0.15.5" host: "pod-livingroom.apl.internal" -Router: - Velica-office: - ip: "10.0.16.1" - host: "velica-office.router.internal" - Gl-basement: - ip: "10.0.16.2" - host: "gl-basement.router.internal" \ No newline at end of file + Appletv-livingroom: + ip: "10.0.15.6" + host: "appletv-livingroom.apl.internal" + Samsuntv-livingroom: + ip: "10.0.15.7" + host: "samsuntv-livingroom.apl.internal" \ No newline at end of file From 7ca9fa8d327b1ebde15c79c20218252ec0a078d6 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 9 Feb 2024 23:25:56 -0500 Subject: [PATCH 26/78] =?UTF-8?q?=F0=9F=A4=96=20Updated=20Router=20Config?= =?UTF-8?q?=20at=20Fri=20Feb=20=209=2023:25:56=20EST=202024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- os/routers/glmain/config.yaml | 5 +++++ os/routers/glmain/output/etc/ethers | 5 +++++ os/routers/glmain/output/summary.yaml | 9 ++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml index 8df090e..31d0b0a 100644 --- a/os/routers/glmain/config.yaml +++ b/os/routers/glmain/config.yaml @@ -78,3 +78,8 @@ apl: mac: '48:E1:5C:5B:CB:A3' - name: 'samsuntv-livingroom' mac: 'F0:70:4F:54:F3:F0' +router: + - name: 'velica-office' + mac: '94:83:C4:41:77:BA' + - name: 'gl-basement' + mac: '94:83:C4:31:D5:CE' diff --git a/os/routers/glmain/output/etc/ethers b/os/routers/glmain/output/etc/ethers index cece672..c01d161 100644 --- a/os/routers/glmain/output/etc/ethers +++ b/os/routers/glmain/output/etc/ethers @@ -72,3 +72,8 @@ CC:6A:10:8B:7D:D3 myq-garage.apl.internal 48:E1:5C:5B:CB:A3 appletv-livingroom.apl.internal F0:70:4F:54:F3:F0 10.0.15.7 F0:70:4F:54:F3:F0 samsuntv-livingroom.apl.internal +#Router +94:83:C4:41:77:BA 10.0.16.1 +94:83:C4:41:77:BA velica-office.router.internal +94:83:C4:31:D5:CE 10.0.16.2 +94:83:C4:31:D5:CE gl-basement.router.internal diff --git a/os/routers/glmain/output/summary.yaml b/os/routers/glmain/output/summary.yaml index 0f4f4e9..bc83a26 100644 --- a/os/routers/glmain/output/summary.yaml +++ b/os/routers/glmain/output/summary.yaml @@ -110,4 +110,11 @@ Apl: host: "appletv-livingroom.apl.internal" Samsuntv-livingroom: ip: "10.0.15.7" - host: "samsuntv-livingroom.apl.internal" \ No newline at end of file + host: "samsuntv-livingroom.apl.internal" +Router: + Velica-office: + ip: "10.0.16.1" + host: "velica-office.router.internal" + Gl-basement: + ip: "10.0.16.2" + host: "gl-basement.router.internal" \ No newline at end of file From 33122fa01a462810f1b7c005f366cbb12a19db99 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 9 Feb 2024 23:34:11 -0500 Subject: [PATCH 27/78] =?UTF-8?q?=F0=9F=A4=96=20Updated=20Router=20Config?= =?UTF-8?q?=20at=20Fri=20Feb=20=209=2023:34:11=20EST=202024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- os/routers/glmain/config.yaml | 6 ++++-- os/routers/glmain/output/etc/ethers | 8 +++++--- os/routers/glmain/output/summary.yaml | 11 +++++++---- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml index 31d0b0a..3008061 100644 --- a/os/routers/glmain/config.yaml +++ b/os/routers/glmain/config.yaml @@ -79,7 +79,9 @@ apl: - name: 'samsuntv-livingroom' mac: 'F0:70:4F:54:F3:F0' router: - - name: 'velica-office' - mac: '94:83:C4:41:77:BA' - name: 'gl-basement' mac: '94:83:C4:31:D5:CE' + - name: 'orbi-office' + mac: '34:98:B5:AC:36:67' + - name: 'velica-office' + mac: '94:83:C4:41:77:BA' diff --git a/os/routers/glmain/output/etc/ethers b/os/routers/glmain/output/etc/ethers index c01d161..d7004b6 100644 --- a/os/routers/glmain/output/etc/ethers +++ b/os/routers/glmain/output/etc/ethers @@ -73,7 +73,9 @@ CC:6A:10:8B:7D:D3 myq-garage.apl.internal F0:70:4F:54:F3:F0 10.0.15.7 F0:70:4F:54:F3:F0 samsuntv-livingroom.apl.internal #Router -94:83:C4:41:77:BA 10.0.16.1 -94:83:C4:41:77:BA velica-office.router.internal -94:83:C4:31:D5:CE 10.0.16.2 +94:83:C4:31:D5:CE 10.0.16.1 94:83:C4:31:D5:CE gl-basement.router.internal +34:98:B5:AC:36:67 10.0.16.2 +34:98:B5:AC:36:67 orbi-office.router.internal +94:83:C4:41:77:BA 10.0.16.3 +94:83:C4:41:77:BA velica-office.router.internal diff --git a/os/routers/glmain/output/summary.yaml b/os/routers/glmain/output/summary.yaml index bc83a26..677fd9f 100644 --- a/os/routers/glmain/output/summary.yaml +++ b/os/routers/glmain/output/summary.yaml @@ -112,9 +112,12 @@ Apl: ip: "10.0.15.7" host: "samsuntv-livingroom.apl.internal" Router: - Velica-office: - ip: "10.0.16.1" - host: "velica-office.router.internal" Gl-basement: + ip: "10.0.16.1" + host: "gl-basement.router.internal" + Orbi-office: ip: "10.0.16.2" - host: "gl-basement.router.internal" \ No newline at end of file + host: "orbi-office.router.internal" + Velica-office: + ip: "10.0.16.3" + host: "velica-office.router.internal" \ No newline at end of file From da7afc5ca01a169315b858c0e2a58313a49fd928 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 9 Feb 2024 23:40:27 -0500 Subject: [PATCH 28/78] =?UTF-8?q?=F0=9F=A4=96=20Updated=20Router=20Config?= =?UTF-8?q?=20at=20Fri=20Feb=20=209=2023:40:27=20EST=202024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- os/routers/glmain/config.yaml | 6 ++++++ os/routers/glmain/output/etc/ethers | 6 ++++++ os/routers/glmain/output/summary.yaml | 9 +++++++++ 3 files changed, 21 insertions(+) diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml index 3008061..dc733e1 100644 --- a/os/routers/glmain/config.yaml +++ b/os/routers/glmain/config.yaml @@ -78,6 +78,12 @@ apl: mac: '48:E1:5C:5B:CB:A3' - name: 'samsuntv-livingroom' mac: 'F0:70:4F:54:F3:F0' + - name: 'leviot-humid1' + mac: '3C:E9:0E:62:14:D8' + - name: 'leviot-humid2' + mac: '1C:9D:C2:39:61:F8' + - name: 'amzn-bedroom' + mac: 'D8:BE:65:F2:ED:18' router: - name: 'gl-basement' mac: '94:83:C4:31:D5:CE' diff --git a/os/routers/glmain/output/etc/ethers b/os/routers/glmain/output/etc/ethers index d7004b6..218f08d 100644 --- a/os/routers/glmain/output/etc/ethers +++ b/os/routers/glmain/output/etc/ethers @@ -72,6 +72,12 @@ CC:6A:10:8B:7D:D3 myq-garage.apl.internal 48:E1:5C:5B:CB:A3 appletv-livingroom.apl.internal F0:70:4F:54:F3:F0 10.0.15.7 F0:70:4F:54:F3:F0 samsuntv-livingroom.apl.internal +3C:E9:0E:62:14:D8 10.0.15.8 +3C:E9:0E:62:14:D8 leviot-humid1.apl.internal +1C:9D:C2:39:61:F8 10.0.15.9 +1C:9D:C2:39:61:F8 leviot-humid2.apl.internal +D8:BE:65:F2:ED:18 10.0.15.10 +D8:BE:65:F2:ED:18 amzn-bedroom.apl.internal #Router 94:83:C4:31:D5:CE 10.0.16.1 94:83:C4:31:D5:CE gl-basement.router.internal diff --git a/os/routers/glmain/output/summary.yaml b/os/routers/glmain/output/summary.yaml index 677fd9f..268b4fc 100644 --- a/os/routers/glmain/output/summary.yaml +++ b/os/routers/glmain/output/summary.yaml @@ -111,6 +111,15 @@ Apl: Samsuntv-livingroom: ip: "10.0.15.7" host: "samsuntv-livingroom.apl.internal" + Leviot-humid1: + ip: "10.0.15.8" + host: "leviot-humid1.apl.internal" + Leviot-humid2: + ip: "10.0.15.9" + host: "leviot-humid2.apl.internal" + Amzn-bedroom: + ip: "10.0.15.10" + host: "amzn-bedroom.apl.internal" Router: Gl-basement: ip: "10.0.16.1" From 840653c28e7b3767640336a372f62c1ac8d7a789 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Mon, 12 Feb 2024 14:58:52 -0500 Subject: [PATCH 29/78] =?UTF-8?q?=F0=9F=A4=96=20Updated=20Router=20Config?= =?UTF-8?q?=20at=20Mon=20Feb=2012=2014:58:52=20EST=202024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- os/routers/glmain/config.yaml | 10 ---------- os/routers/glmain/output/etc/ethers | 20 +++++--------------- os/routers/glmain/output/summary.yaml | 27 ++++++--------------------- 3 files changed, 11 insertions(+), 46 deletions(-) diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml index dc733e1..034ae4b 100644 --- a/os/routers/glmain/config.yaml +++ b/os/routers/glmain/config.yaml @@ -66,14 +66,8 @@ iot: apl: - name: 'hp-print' mac: '48:9E:BD:CB:07:E3' - - name: 'gm-eddie' - mac: '20:DF:B9:71:55:9C' - name: 'myq-garage' mac: 'CC:6A:10:8B:7D:D3' - - name: 'pod-korie' - mac: '04:99:B9:86:2D:AE' - - name: 'pod-livingroom' - mac: '04:99:B9:88:ED:3B' - name: 'appletv-livingroom' mac: '48:E1:5C:5B:CB:A3' - name: 'samsuntv-livingroom' @@ -82,12 +76,8 @@ apl: mac: '3C:E9:0E:62:14:D8' - name: 'leviot-humid2' mac: '1C:9D:C2:39:61:F8' - - name: 'amzn-bedroom' - mac: 'D8:BE:65:F2:ED:18' router: - name: 'gl-basement' mac: '94:83:C4:31:D5:CE' - name: 'orbi-office' mac: '34:98:B5:AC:36:67' - - name: 'velica-office' - mac: '94:83:C4:41:77:BA' diff --git a/os/routers/glmain/output/etc/ethers b/os/routers/glmain/output/etc/ethers index 218f08d..12eec24 100644 --- a/os/routers/glmain/output/etc/ethers +++ b/os/routers/glmain/output/etc/ethers @@ -60,28 +60,18 @@ C8:2B:96:1D:DA:B4 shelly-laundry-light.iot.internal #Apl 48:9E:BD:CB:07:E3 10.0.15.1 48:9E:BD:CB:07:E3 hp-print.apl.internal -20:DF:B9:71:55:9C 10.0.15.2 -20:DF:B9:71:55:9C gm-eddie.apl.internal -CC:6A:10:8B:7D:D3 10.0.15.3 +CC:6A:10:8B:7D:D3 10.0.15.2 CC:6A:10:8B:7D:D3 myq-garage.apl.internal -04:99:B9:86:2D:AE 10.0.15.4 -04:99:B9:86:2D:AE pod-korie.apl.internal -04:99:B9:88:ED:3B 10.0.15.5 -04:99:B9:88:ED:3B pod-livingroom.apl.internal -48:E1:5C:5B:CB:A3 10.0.15.6 +48:E1:5C:5B:CB:A3 10.0.15.3 48:E1:5C:5B:CB:A3 appletv-livingroom.apl.internal -F0:70:4F:54:F3:F0 10.0.15.7 +F0:70:4F:54:F3:F0 10.0.15.4 F0:70:4F:54:F3:F0 samsuntv-livingroom.apl.internal -3C:E9:0E:62:14:D8 10.0.15.8 +3C:E9:0E:62:14:D8 10.0.15.5 3C:E9:0E:62:14:D8 leviot-humid1.apl.internal -1C:9D:C2:39:61:F8 10.0.15.9 +1C:9D:C2:39:61:F8 10.0.15.6 1C:9D:C2:39:61:F8 leviot-humid2.apl.internal -D8:BE:65:F2:ED:18 10.0.15.10 -D8:BE:65:F2:ED:18 amzn-bedroom.apl.internal #Router 94:83:C4:31:D5:CE 10.0.16.1 94:83:C4:31:D5:CE gl-basement.router.internal 34:98:B5:AC:36:67 10.0.16.2 34:98:B5:AC:36:67 orbi-office.router.internal -94:83:C4:41:77:BA 10.0.16.3 -94:83:C4:41:77:BA velica-office.router.internal diff --git a/os/routers/glmain/output/summary.yaml b/os/routers/glmain/output/summary.yaml index 268b4fc..6aad57f 100644 --- a/os/routers/glmain/output/summary.yaml +++ b/os/routers/glmain/output/summary.yaml @@ -93,40 +93,25 @@ Apl: Hp-print: ip: "10.0.15.1" host: "hp-print.apl.internal" - Gm-eddie: - ip: "10.0.15.2" - host: "gm-eddie.apl.internal" Myq-garage: - ip: "10.0.15.3" + ip: "10.0.15.2" host: "myq-garage.apl.internal" - Pod-korie: - ip: "10.0.15.4" - host: "pod-korie.apl.internal" - Pod-livingroom: - ip: "10.0.15.5" - host: "pod-livingroom.apl.internal" Appletv-livingroom: - ip: "10.0.15.6" + ip: "10.0.15.3" host: "appletv-livingroom.apl.internal" Samsuntv-livingroom: - ip: "10.0.15.7" + ip: "10.0.15.4" host: "samsuntv-livingroom.apl.internal" Leviot-humid1: - ip: "10.0.15.8" + ip: "10.0.15.5" host: "leviot-humid1.apl.internal" Leviot-humid2: - ip: "10.0.15.9" + ip: "10.0.15.6" host: "leviot-humid2.apl.internal" - Amzn-bedroom: - ip: "10.0.15.10" - host: "amzn-bedroom.apl.internal" Router: Gl-basement: ip: "10.0.16.1" host: "gl-basement.router.internal" Orbi-office: ip: "10.0.16.2" - host: "orbi-office.router.internal" - Velica-office: - ip: "10.0.16.3" - host: "velica-office.router.internal" \ No newline at end of file + host: "orbi-office.router.internal" \ No newline at end of file From ee478395baf5f00f0b39c42f347ca64bde751a9a Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Mon, 12 Feb 2024 15:04:18 -0500 Subject: [PATCH 30/78] =?UTF-8?q?=F0=9F=A4=96=20Updated=20Router=20Config?= =?UTF-8?q?=20at=20Mon=20Feb=2012=2015:04:18=20EST=202024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- os/routers/glmain/config.yaml | 14 ++++++++++++++ os/routers/glmain/gen-mappings.py | 23 ++++++++++++----------- os/routers/glmain/output/etc/ethers | 12 +++++++----- os/routers/glmain/output/summary.yaml | 18 ++++++++++++------ 4 files changed, 45 insertions(+), 22 deletions(-) diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml index 034ae4b..3a744a1 100644 --- a/os/routers/glmain/config.yaml +++ b/os/routers/glmain/config.yaml @@ -66,16 +66,30 @@ iot: apl: - name: 'hp-print' mac: '48:9E:BD:CB:07:E3' + - name: 'gm-eddie' + mac: '20:DF:B9:71:55:9C' + justMac: true - name: 'myq-garage' mac: 'CC:6A:10:8B:7D:D3' + - name: 'pod-korie' + mac: '04:99:B9:86:2D:AE' + justMac: true + - name: 'pod-livingroom' + mac: '04:99:B9:88:ED:3B' + justMac: true - name: 'appletv-livingroom' mac: '48:E1:5C:5B:CB:A3' - name: 'samsuntv-livingroom' mac: 'F0:70:4F:54:F3:F0' - name: 'leviot-humid1' mac: '3C:E9:0E:62:14:D8' + justMac: true - name: 'leviot-humid2' mac: '1C:9D:C2:39:61:F8' + justMac: true + - name: 'amzn-bedroom' + mac: 'D8:BE:65:F2:ED:18' + justMac: true router: - name: 'gl-basement' mac: '94:83:C4:31:D5:CE' diff --git a/os/routers/glmain/gen-mappings.py b/os/routers/glmain/gen-mappings.py index 70de256..b21a27f 100755 --- a/os/routers/glmain/gen-mappings.py +++ b/os/routers/glmain/gen-mappings.py @@ -41,20 +41,21 @@ with DNSMASQ_CONF.open('w') as dfp, SUMMARY.open('w') as sfp, ETHERS.open('w') a ip_prefix = ip_prefix_map[sub_domain] sfp.write(f'\n{cap1_and_join(sub_domain)}:') efp.write(f'#{cap1_and_join(sub_domain)}\n') - for ip_suffix, dvc in enumerate(configs, start=1): + ip_suffix = 0 + for dvc in configs: + ip_suffix += 1 mac = dvc['mac'] name = dvc['name'] sfp.write(f'\n {cap1_and_join(name)}:') ip = f"{ip_prefix}{ip_suffix}" host = f"{name}.{sub_domain}.{root_domain}" - sfp.write(f'\n ip: "{ip}"') + if not dvc.get('justMac', False): + sfp.write(f'\n ip: "{ip}"') sfp.write(f'\n host: "{host}"') - # dfp.write(f"dhcp-host={mac},{cap1_and_join(sub_domain, name)},{ip},infinite\n") - # dfp.write(f"address=/{host}/{ip}\n") - efp.write(f'{mac} {ip}\n') - efp.write(f'{mac} {host}\n') - if domain := dvc.get('domain'): - dfp.write(f"address=/{domain}/{ip}\n") - dfp.write(f"address=/.{domain}/{ip}\n") - sfp.write(f'\n domain: "{domain}"') - # efp.write(f'{mac} {domain}\n') \ No newline at end of file + if not dvc.get('justMac', False): + efp.write(f'{mac} {ip}\n') + if domain := dvc.get('domain'): + dfp.write(f"address=/{domain}/{ip}\n") + dfp.write(f"address=/.{domain}/{ip}\n") + sfp.write(f'\n domain: "{domain}"') + efp.write(f'{mac} {host}\n') \ No newline at end of file diff --git a/os/routers/glmain/output/etc/ethers b/os/routers/glmain/output/etc/ethers index 12eec24..c80a4ee 100644 --- a/os/routers/glmain/output/etc/ethers +++ b/os/routers/glmain/output/etc/ethers @@ -60,16 +60,18 @@ C8:2B:96:1D:DA:B4 shelly-laundry-light.iot.internal #Apl 48:9E:BD:CB:07:E3 10.0.15.1 48:9E:BD:CB:07:E3 hp-print.apl.internal -CC:6A:10:8B:7D:D3 10.0.15.2 +20:DF:B9:71:55:9C gm-eddie.apl.internal +CC:6A:10:8B:7D:D3 10.0.15.3 CC:6A:10:8B:7D:D3 myq-garage.apl.internal -48:E1:5C:5B:CB:A3 10.0.15.3 +04:99:B9:86:2D:AE pod-korie.apl.internal +04:99:B9:88:ED:3B pod-livingroom.apl.internal +48:E1:5C:5B:CB:A3 10.0.15.6 48:E1:5C:5B:CB:A3 appletv-livingroom.apl.internal -F0:70:4F:54:F3:F0 10.0.15.4 +F0:70:4F:54:F3:F0 10.0.15.7 F0:70:4F:54:F3:F0 samsuntv-livingroom.apl.internal -3C:E9:0E:62:14:D8 10.0.15.5 3C:E9:0E:62:14:D8 leviot-humid1.apl.internal -1C:9D:C2:39:61:F8 10.0.15.6 1C:9D:C2:39:61:F8 leviot-humid2.apl.internal +D8:BE:65:F2:ED:18 amzn-bedroom.apl.internal #Router 94:83:C4:31:D5:CE 10.0.16.1 94:83:C4:31:D5:CE gl-basement.router.internal diff --git a/os/routers/glmain/output/summary.yaml b/os/routers/glmain/output/summary.yaml index 6aad57f..95c3df0 100644 --- a/os/routers/glmain/output/summary.yaml +++ b/os/routers/glmain/output/summary.yaml @@ -93,21 +93,27 @@ Apl: Hp-print: ip: "10.0.15.1" host: "hp-print.apl.internal" + Gm-eddie: + host: "gm-eddie.apl.internal" Myq-garage: - ip: "10.0.15.2" - host: "myq-garage.apl.internal" - Appletv-livingroom: ip: "10.0.15.3" + host: "myq-garage.apl.internal" + Pod-korie: + host: "pod-korie.apl.internal" + Pod-livingroom: + host: "pod-livingroom.apl.internal" + Appletv-livingroom: + ip: "10.0.15.6" host: "appletv-livingroom.apl.internal" Samsuntv-livingroom: - ip: "10.0.15.4" + ip: "10.0.15.7" host: "samsuntv-livingroom.apl.internal" Leviot-humid1: - ip: "10.0.15.5" host: "leviot-humid1.apl.internal" Leviot-humid2: - ip: "10.0.15.6" host: "leviot-humid2.apl.internal" + Amzn-bedroom: + host: "amzn-bedroom.apl.internal" Router: Gl-basement: ip: "10.0.16.1" From ce9c9c1a8b080dd23158ebf9d2b2674a632fadae Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Mon, 12 Feb 2024 15:08:15 -0500 Subject: [PATCH 31/78] =?UTF-8?q?=F0=9F=A4=96=20Updated=20Router=20Config?= =?UTF-8?q?=20at=20Mon=20Feb=2012=2015:08:15=20EST=202024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- os/routers/glmain/config.yaml | 9 +++++++++ os/routers/glmain/gen-mappings.py | 8 ++++++++ os/routers/glmain/output/etc/ethers | 5 +++++ os/routers/glmain/output/summary.yaml | 11 ++++++++++- 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml index 3a744a1..18d6fbf 100644 --- a/os/routers/glmain/config.yaml +++ b/os/routers/glmain/config.yaml @@ -95,3 +95,12 @@ router: mac: '94:83:C4:31:D5:CE' - name: 'orbi-office' mac: '34:98:B5:AC:36:67' +devices: + - name: 'fwlaptop' + mac: '14:AC:60:29:85:4D' + - name: 'sumomac' + mac: 'F8:E4:3B:36:0F:E4' + - name: 'steamdeck' + mac: '34:6F:24:CA:70:57' + - name: 'vitapc' + mac: 'E0:0A:F6:79:C6:E9' \ No newline at end of file diff --git a/os/routers/glmain/gen-mappings.py b/os/routers/glmain/gen-mappings.py index b21a27f..88bb200 100755 --- a/os/routers/glmain/gen-mappings.py +++ b/os/routers/glmain/gen-mappings.py @@ -24,6 +24,12 @@ ip_prefix_map = { "iot": "10.0.14.", "apl": "10.0.15.", "router": "10.0.16.", + "devices": "10.0.0.", +} +defaults = { + 'devices': { + 'justMac': True, + } } def cap1_and_join(*args: str) -> str: @@ -38,12 +44,14 @@ with CONFIG_FILE.open('r') as fp: with DNSMASQ_CONF.open('w') as dfp, SUMMARY.open('w') as sfp, ETHERS.open('w') as efp: for sub_domain, configs in devices.items(): + default_values = defaults.get(sub_domain, {}) ip_prefix = ip_prefix_map[sub_domain] sfp.write(f'\n{cap1_and_join(sub_domain)}:') efp.write(f'#{cap1_and_join(sub_domain)}\n') ip_suffix = 0 for dvc in configs: ip_suffix += 1 + dvc = {**default_values, **dvc} mac = dvc['mac'] name = dvc['name'] sfp.write(f'\n {cap1_and_join(name)}:') diff --git a/os/routers/glmain/output/etc/ethers b/os/routers/glmain/output/etc/ethers index c80a4ee..a8c1a32 100644 --- a/os/routers/glmain/output/etc/ethers +++ b/os/routers/glmain/output/etc/ethers @@ -77,3 +77,8 @@ D8:BE:65:F2:ED:18 amzn-bedroom.apl.internal 94:83:C4:31:D5:CE gl-basement.router.internal 34:98:B5:AC:36:67 10.0.16.2 34:98:B5:AC:36:67 orbi-office.router.internal +#Devices +14:AC:60:29:85:4D fwlaptop.devices.internal +F8:E4:3B:36:0F:E4 sumomac.devices.internal +34:6F:24:CA:70:57 steamdeck.devices.internal +E0:0A:F6:79:C6:E9 vitapc.devices.internal diff --git a/os/routers/glmain/output/summary.yaml b/os/routers/glmain/output/summary.yaml index 95c3df0..091a849 100644 --- a/os/routers/glmain/output/summary.yaml +++ b/os/routers/glmain/output/summary.yaml @@ -120,4 +120,13 @@ Router: host: "gl-basement.router.internal" Orbi-office: ip: "10.0.16.2" - host: "orbi-office.router.internal" \ No newline at end of file + host: "orbi-office.router.internal" +Devices: + Fwlaptop: + host: "fwlaptop.devices.internal" + Sumomac: + host: "sumomac.devices.internal" + Steamdeck: + host: "steamdeck.devices.internal" + Vitapc: + host: "vitapc.devices.internal" \ No newline at end of file From 327f4e40da2050f40a83765ecf4ecd4d507cf960 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 14 Feb 2024 16:00:49 -0500 Subject: [PATCH 32/78] WIP of mesh --- .gitignore | 4 +- os/routers/openwrt-mesh/push.sh | 46 +++++++++++ .../openwrt-mesh/remote-scripts/common.sh | 9 +++ .../openwrt-mesh/remote-scripts/create-ap.sh | 29 +++++++ .../remote-scripts/create-main.sh | 80 +++++++++++++++++++ .../remote-scripts/gen-etc-wireless.sh | 48 +++++++++++ 6 files changed, 215 insertions(+), 1 deletion(-) create mode 100755 os/routers/openwrt-mesh/push.sh create mode 100644 os/routers/openwrt-mesh/remote-scripts/common.sh create mode 100755 os/routers/openwrt-mesh/remote-scripts/create-ap.sh create mode 100755 os/routers/openwrt-mesh/remote-scripts/create-main.sh create mode 100755 os/routers/openwrt-mesh/remote-scripts/gen-etc-wireless.sh diff --git a/.gitignore b/.gitignore index 7f5cc86..970b053 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,6 @@ devenv.local.nix # Terraform *.tfvars -.terraform \ No newline at end of file +.terraform +os/routers/openwrt-mesh/.env +.DS_Store diff --git a/os/routers/openwrt-mesh/push.sh b/os/routers/openwrt-mesh/push.sh new file mode 100755 index 0000000..e84a34f --- /dev/null +++ b/os/routers/openwrt-mesh/push.sh @@ -0,0 +1,46 @@ +#!/bin/sh +BASE_PATH=$(realpath "${BASH_SOURCE[0]}" | xargs dirname) + +pushd "$BASE_PATH" + +mode=${1:-"main"} +host=${2:-"root@192.168.1.1"} +file_name="create-${mode}.sh" +dotenv_file_name=".env" + + +if [ ! -f "${file_name}" ]; then + echo "Invalid Mode ${mode}!" + echo "Please use 'main' or 'ap'" + exit 1 +fi +if [ ! -f "${dotenv_file_name}" ]; then + echo "Missing dotenv file!" + echo "Please create a ${dotenv_file_name} in $BASE_PATH!" + exit 1 +fi + +echo "mode=${mode}" +echo "host=${host}" + +read -p "Continue? [Y/N]" -n 1 -r +echo +if [[ $REPLY =~ ^[Yy]$ ]] +then + echo "Continuing..." +else + echo "Stopping!" + exit 1 +fi + +scp -O "$file_name" "$host:/tmp/update-script.sh" +scp -O "$dotenv_file_name" "$host:/tmp/.env" +ssh -t "$host" <> "$output_file" + +config wifi-iface 'mesh' + option device 'radio0' + option disabled '0' + option mode 'mesh' + option ifname 'mesh0' + option network 'lan' + option mesh_id 'kosovsky-mesh' + option encryption 'sae' + option key '${MESH_PWD}' + option mesh_fwding '1' + option mesh_rssi_threshold '0' + +config wifi-iface 'wifi5g' + option ssid 'kosovsky-main' + option disabled '0' + option device 'radio2' + option mode 'ap' + option network 'lan' + option encryption 'psk2' + option key '${WIFI_PWD}' + option ieee80211r '1' + option mobility_domain '7da1' + option ft_over_ds '0' + +config wifi-iface 'wifi2g' + option ssid 'kosovsky-main' + option disabled '0' + option device 'radio1' + option mode 'ap' + option network 'lan' + option encryption 'psk2' + option key '${WIFI_PWD}' + option ieee80211r '1' + option mobility_domain '3333' + option ft_over_ds '0' + option ft_psk_generate_local '1' + +EOF \ No newline at end of file From 6d490c91a5f3c0fba37e197112a5dd9356fa26d2 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 14 Feb 2024 16:01:09 -0500 Subject: [PATCH 33/78] WIP of mesh --- os/routers/openwrt-mesh/remote-scripts/create-main.sh | 10 +++++----- .../openwrt-mesh/remote-scripts/gen-etc-wireless.sh | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/os/routers/openwrt-mesh/remote-scripts/create-main.sh b/os/routers/openwrt-mesh/remote-scripts/create-main.sh index aba435d..427017d 100755 --- a/os/routers/openwrt-mesh/remote-scripts/create-main.sh +++ b/os/routers/openwrt-mesh/remote-scripts/create-main.sh @@ -1,4 +1,4 @@ -#!/bin/ash +#!/bin/bash # Turn an OpenWrt dumb access point into a Wi-fi mesh point # ###################### @@ -47,15 +47,15 @@ uci delete wireless.default_radio1 # create the mesh Wifi uci set wireless.wifinet0=wifi-iface -uci set wireless.wifinet0.device=$MESH_RADIO +uci set wireless.wifinet0.device="$MESH_RADIO" uci set wireless.wifinet0.mode='mesh' uci set wireless.wifinet0.encryption='sae' -uci set wireless.wifinet0.mesh_id=$MESH_NAME +uci set wireless.wifinet0.mesh_id="$MESH_NAME" uci set wireless.wifinet0.mesh_fwding='1' uci set wireless.wifinet0.mesh_rssi_threshold='0' -uci set wireless.wifinet0.key=$MESH_PWD +uci set wireless.wifinet0.key="$MESH_PWD" uci set wireless.wifinet0.network='lan' -uci set "wireless.$MESH_RADIO.channel"=$MESH_CHANNEL +uci set "wireless.$MESH_RADIO.channel=$MESH_CHANNEL" uci delete "wireless.$MESH_RADIO.disabled" # create the AP Wifi diff --git a/os/routers/openwrt-mesh/remote-scripts/gen-etc-wireless.sh b/os/routers/openwrt-mesh/remote-scripts/gen-etc-wireless.sh index fde9935..5786323 100755 --- a/os/routers/openwrt-mesh/remote-scripts/gen-etc-wireless.sh +++ b/os/routers/openwrt-mesh/remote-scripts/gen-etc-wireless.sh @@ -1,7 +1,7 @@ #!/bin/sh -MESH_PWD=$(echo $MESH_PWD | tr -d '"') -WIFI_PWD=$(echo $WIFI_PWD | tr -d '"') +MESH_PWD=$(echo "$MESH_PWD" | tr -d '"') +WIFI_PWD=$(echo "$WIFI_PWD" | tr -d '"') output_file=${1:-"/etc/config/wireless"} echo "writing to $output_file" From ba4a1fd9cc1b6cd33ef9361411446ca803894590 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 14 Feb 2024 16:01:20 -0500 Subject: [PATCH 34/78] =?UTF-8?q?=F0=9F=A4=96=20Updated=20Router=20Config?= =?UTF-8?q?=20at=20Wed=20Feb=2014=2016:01:20=20EST=202024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- os/routers/glmain/config.yaml | 6 ++++-- os/routers/glmain/output/etc/ethers | 6 ++++-- os/routers/glmain/output/summary.yaml | 7 +++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml index 18d6fbf..698718a 100644 --- a/os/routers/glmain/config.yaml +++ b/os/routers/glmain/config.yaml @@ -93,8 +93,10 @@ apl: router: - name: 'gl-basement' mac: '94:83:C4:31:D5:CE' - - name: 'orbi-office' - mac: '34:98:B5:AC:36:67' + - name: 'velica-main' + mac: '94:83:C4:41:77:BA' + - name: 'velica-node1' + mac: '94:83:C4:41:77:29' devices: - name: 'fwlaptop' mac: '14:AC:60:29:85:4D' diff --git a/os/routers/glmain/output/etc/ethers b/os/routers/glmain/output/etc/ethers index a8c1a32..ccb86ad 100644 --- a/os/routers/glmain/output/etc/ethers +++ b/os/routers/glmain/output/etc/ethers @@ -75,8 +75,10 @@ D8:BE:65:F2:ED:18 amzn-bedroom.apl.internal #Router 94:83:C4:31:D5:CE 10.0.16.1 94:83:C4:31:D5:CE gl-basement.router.internal -34:98:B5:AC:36:67 10.0.16.2 -34:98:B5:AC:36:67 orbi-office.router.internal +94:83:C4:41:77:BA 10.0.16.2 +94:83:C4:41:77:BA velica-main.router.internal +94:83:C4:41:77:29 10.0.16.3 +94:83:C4:41:77:29 velica-node1.router.internal #Devices 14:AC:60:29:85:4D fwlaptop.devices.internal F8:E4:3B:36:0F:E4 sumomac.devices.internal diff --git a/os/routers/glmain/output/summary.yaml b/os/routers/glmain/output/summary.yaml index 091a849..ea50c06 100644 --- a/os/routers/glmain/output/summary.yaml +++ b/os/routers/glmain/output/summary.yaml @@ -118,9 +118,12 @@ Router: Gl-basement: ip: "10.0.16.1" host: "gl-basement.router.internal" - Orbi-office: + Velica-main: ip: "10.0.16.2" - host: "orbi-office.router.internal" + host: "velica-main.router.internal" + Velica-node1: + ip: "10.0.16.3" + host: "velica-node1.router.internal" Devices: Fwlaptop: host: "fwlaptop.devices.internal" From c8cc82b49d188b872ba212bde4c943cdcf480719 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 14 Feb 2024 16:01:37 -0500 Subject: [PATCH 35/78] killed stupid precommite --- devenv.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/devenv.nix b/devenv.nix index b794745..2b14344 100644 --- a/devenv.nix +++ b/devenv.nix @@ -14,5 +14,4 @@ languages.python.enable = true; languages.python.venv.enable = true; languages.python.venv.requirements = ./pydeps.requirements; - pre-commit.hooks.shellcheck.enable = true; } From f799e6c7e51c4dcfd93ee599f807a273a8ac7a9f Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 10:38:24 -0500 Subject: [PATCH 36/78] added sitemonitor --- k8s/apps/ingresses/templates/_helpers/ingress.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/k8s/apps/ingresses/templates/_helpers/ingress.yaml b/k8s/apps/ingresses/templates/_helpers/ingress.yaml index 915f41f..4b72ab2 100644 --- a/k8s/apps/ingresses/templates/_helpers/ingress.yaml +++ b/k8s/apps/ingresses/templates/_helpers/ingress.yaml @@ -79,6 +79,8 @@ metadata: traefik.ingress.kubernetes.io/router.middlewares: {{ .middleware | default "apps-ingresses-https-redirect"}}@kubernetescrd gethomepage.dev/enabled: "true" gethomepage.dev/name: "{{.prefix}}@{{.namespace}}" + gethomepage.dev/name: "{{.prefix}}@{{.namespace}}" + gethomepage.dev/siteMonitor: 'http://{{.service}}.{{ .namespace }}.svc.cluster.local:{{.port | default 80}}{{ .path | default "/" }}' # gethomepage.dev/description: {{ .description | default "" }} gethomepage.dev/group: {{ .group | default "Unassigned" }} {{ if .icon }} From aad8e57b378f26448389ba842cf7d17b13207466 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 10:39:17 -0500 Subject: [PATCH 37/78] correct port --- k8s/apps/ingresses/values-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/apps/ingresses/values-prod.yaml b/k8s/apps/ingresses/values-prod.yaml index 1633512..a35da62 100644 --- a/k8s/apps/ingresses/values-prod.yaml +++ b/k8s/apps/ingresses/values-prod.yaml @@ -16,7 +16,7 @@ reverseProxy: basement: ip: "10.0.12.2" - port: "8123" + port: "80" overrides: icon: https://basement.home.sosnovsky.ca/static/icons/favicon.ico From e8dedcb9dca4f3d753dbe7e5959b3f46b4d77bbb Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 10:41:13 -0500 Subject: [PATCH 38/78] additional services --- k8s/apps/ingresses/values-prod.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/k8s/apps/ingresses/values-prod.yaml b/k8s/apps/ingresses/values-prod.yaml index a35da62..063bc42 100644 --- a/k8s/apps/ingresses/values-prod.yaml +++ b/k8s/apps/ingresses/values-prod.yaml @@ -6,7 +6,7 @@ reverseProxy: ip: "10.0.12.1" port: "80" overrides: - icon: https://castle.home.sosnovsky.ca/static/icons/favicon.ico + icon: http://10.0.12.1:80/static/icons/favicon.ico kuma: ip: "10.0.12.1" @@ -18,7 +18,7 @@ reverseProxy: ip: "10.0.12.2" port: "80" overrides: - icon: https://basement.home.sosnovsky.ca/static/icons/favicon.ico + icon: http://10.0.12.2:80/static/icons/favicon.ico pitorrent: ip: "10.0.10.3" @@ -26,16 +26,16 @@ reverseProxy: overrides: middleware: "apps-ingresses-chain-authentik" group: "Video Hosting" + + esphome: + ip: "10.0.10.4" + port: "6052" - # scrypted: - # disableIngress: true - # ip: "192.168.0.200" - # port: "11080" - - # glroutermetrics: - # disableIngress: true - # ip: "192.168.8.1" - # port: "11080" + scrypted: + ip: "10.0.10.4" + port: "11080" + overrides: + group: "Cameras" cloudflare: enabled: true \ No newline at end of file From 44b8ae76faeae6a679bdaea75ff00d2c4964f671 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 10:43:38 -0500 Subject: [PATCH 39/78] middleware --- k8s/apps/ingresses/values-prod.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/k8s/apps/ingresses/values-prod.yaml b/k8s/apps/ingresses/values-prod.yaml index 063bc42..5b50030 100644 --- a/k8s/apps/ingresses/values-prod.yaml +++ b/k8s/apps/ingresses/values-prod.yaml @@ -30,6 +30,8 @@ reverseProxy: esphome: ip: "10.0.10.4" port: "6052" + overrides: + middleware: "apps-ingresses-chain-authentik" scrypted: ip: "10.0.10.4" From 7f6f93c7d32073b8543ec0a791ef31ca5ba70766 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 10:44:44 -0500 Subject: [PATCH 40/78] clean up --- k8s/argoapps/apps-values/ingresses.yaml | 35 ++++++++++++------------- k8s/argoapps/values.yaml | 14 ---------- 2 files changed, 17 insertions(+), 32 deletions(-) diff --git a/k8s/argoapps/apps-values/ingresses.yaml b/k8s/argoapps/apps-values/ingresses.yaml index ca2c849..8014be3 100644 --- a/k8s/argoapps/apps-values/ingresses.yaml +++ b/k8s/argoapps/apps-values/ingresses.yaml @@ -41,7 +41,6 @@ services: namespace: "apps-ingresses" middleware: "apps-ingresses-chain-authentik" group: "Demo" - # icon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAGPElEQVR42u1bDUyUdRj/iwpolMlcbZqtXFnNsuSCez/OIMg1V7SFONuaU8P1MWy1lcPUyhK1uVbKcXfvy6GikTGKCmpEyoejJipouUBcgsinhwUKKKJ8PD3vnzsxuLv35Q644+Ue9mwH3P3f5/d7n6/3/3+OEJ/4xCc+8YQYtQuJwB0kIp+JrzUTB7iJuweBf4baTlJ5oCqw11C/JHp+tnqBb1ngT4z8WgReTUGbWCBGq0qvKRFcHf4eT/ZFBKoLvMBGIbhiYkaQIjcAfLAK+D8z9YhjxMgsVUGc84+gyx9AYD0khXcMfLCmUBL68HMZ+PnHxyFw3Uwi8B8hgJYh7j4c7c8PV5CEbUTUzBoHcU78iIl/FYFXWmPaNeC3q4mz5YcqJPI1JGKql2Z3hkcjD5EUznmcu6qiNT+Y2CPEoH3Wm4A/QERWQFe9QQ0caeCDlSZJrht1HxG0D3sOuCEiCA1aj4ZY3Ipzl8LiVtn8hxi5zRgWM8YYPBODF/9zxOLcVRVs+YGtwFzxCs1Bo9y+avBiOTQeUzwI3F5+kOwxsXkkmWNHHrjUokqtqtSyysW5gUHV4mtmZEHSdRkl+aELvcFIRN397gPPXD4ZgbxJW1S5OJdA60MgUAyHu1KfAz+pfCUtwr+HuQc8ORQ1jK4ZgGsTvcY5uQP5oYkY2HfcK5sGLpS6l1xZQwNn7Xkedp3OgMrWC1DX0Qwnms/A1rK9cF9atNVo18DP/3o5fF99BGo7LFDRWgMJJQaYQv/PyOcHySP0TITrBIhYb+WSHLrlNGEx5NeXgj2paW8C5rs46h3Dc3kt3G2Ogr9aqoes+f5RvbL1aJ5iXnKnxkfIEoB3N/zHeHAmF9ovwryvYvC9TysnICkEonPX212vvOU8+As6eS+QCDAw0aNLABq6LO8DkJMSSznMMEfScFFGwCJYXbDV7lq17RYIQu+QTYpjRUBM3gZQIt+cOwyTpWRpYBQRsKrgU4ceNS4JkCSxLI1+ZsIS0NvXB6sLE/tL5EQkQJKOm52YON9y7glqJkCSOqzrD6Uvc1wZ1EBA07V/IafmN4ckHG+ugJkSEHuVQQ0ENFy9BLP3R0NR4ymHJGRWFWBnZ6fPVwMBF9EDgrD2z0USqtoaHJKw49SBoZ2dWggIxmcEsvspYLLi4PKNDrvv68OfuKLt/68MqiJAan4Q0IpDm6G7r8fue692X4fI7PiByqA6AqygNh0XHIaClDOkpz9aGVRJABo8CTP+3sqfHZJQeqkSgvHZn+xaqEICKAlhECSGO60MWdVF4IcesDL/ExUSYN3okCrD31fqHZLwcWkq5owPVUoA3UcIgdBv10BrV7vdz3b39kBhw0kVE2BNirG/bqRghyPqIcBKQkKJcVgE1LQ1wR3S5ooqCDBKlSEUzGdyFBNwvq1RTQT0b4BOF5+BgoayCUqAtTLMSXsRzl6uHX8EONoUtXS2KCfAusOsyVwFLV1tznNAuzflAGxb+R/esGuodDcD0bUVbYLelhRf/mWD08ogdYtTjNwYbIsrORhBIwJMPOTWHh1i6Lriz107FUKviivcZvfp8WZvN8TmbVS2rtsHI8mMtn9gSe50KAz79yWw8490OGYpp8lsTUGictd3EA6PHVwB20+mYUNURo/aMs4dhqjsdcoOWGxH5yYu0g0P0EzFBd7DxZoVHY7aHmWtB6VunwhLB6P0gFULk6zhJnvnBw5HW9D9N5GkpQEjMBcQOg+JMBNxjMZgHISawvGZHiKw+0mybv5ozP0txgvk07AQvWxAoh98sXsur3RmwMStxIud9fiIzMAIXTV6yNqxHaH7gg1GA7bgxVvHfEjq1hAl10ZM/A46gO0x0bOPoiHpSEDvsMZhXVVbVRL4TLz2E140EK1dgsnnd9mBaHcmwuigJHeCGLkXvHNaNHOBP4J/HYmoGbGwsJU1ka0nAvM2ht40758ZNmvvRRJ24l3roMa7MxVq4jpRdyMRc8bh9wR0TyIRWdR9hzNXaJs3Ftif6KDWuBcBH0hErky2bNraV5E9jcBjiapE1ExHkO8iEY1OvjLTjAkugezh7ySqFUPoXHTtZAR7ncY4rRrYYgtcCtGHPUgmjEhPmiKXjXc/l4g6HfGJT3ziEw/If86JzB/YMku9AAAAAElFTkSuQmCC" - prefix: "nextcloud" service: "nextcloud" namespace: "apps-nextcloud" @@ -60,23 +59,23 @@ services: namespace: "apps-videohosting" port: 8096 group: "Apps" - - prefix: "frigate" - service: "frigate" - namespace: "apps-frigate" - middleware: "apps-ingresses-chain-authentik" - group: "Cameras" - icon: "https://frigate.home.sosnovsky.ca/assets/favicon-92a9ac8b.ico" - - prefix: "scrypted" - service: "scrypted" - namespace: "apps-frigate" - middleware: "apps-ingresses-chain-authentik" - group: "Cameras" - - prefix: "go2rtc" - service: "go2rtc" - namespace: "apps-frigate" - middleware: "apps-ingresses-chain-authentik" - group: "Cameras" - icon: "https://frigate.home.sosnovsky.ca/assets/favicon-92a9ac8b.ico" + # - prefix: "frigate" + # service: "frigate" + # namespace: "apps-frigate" + # middleware: "apps-ingresses-chain-authentik" + # group: "Cameras" + # icon: "https://frigate.home.sosnovsky.ca/assets/favicon-92a9ac8b.ico" + # - prefix: "scrypted" + # service: "scrypted" + # namespace: "apps-frigate" + # middleware: "apps-ingresses-chain-authentik" + # group: "Cameras" + # - prefix: "go2rtc" + # service: "go2rtc" + # namespace: "apps-frigate" + # middleware: "apps-ingresses-chain-authentik" + # group: "Cameras" + # icon: "https://frigate.home.sosnovsky.ca/assets/favicon-92a9ac8b.ico" - prefix: "main" service: "homepage" namespace: "chart-homepage" diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index 34a065a..a9aaf5d 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -25,20 +25,6 @@ global: port: 1883 host: 192.168.0.23 -videohosting: - services: - jackett: - ports: - tcp: - web: 9117 - qbittorrent: - ports: - tcp: - web: 8080 - 6881: 6881 - udp: - 6881: 6881 - apps: webapps: valuesFile: webapps.yaml From 816047439d91bf4de92092f350f8ace9a19ea991 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 10:45:52 -0500 Subject: [PATCH 41/78] clean up part 2 --- k8s/argoapps/values-prod.yaml | 26 +++++++++++++------------- k8s/argoapps/values.yaml | 20 +++++++++++--------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/k8s/argoapps/values-prod.yaml b/k8s/argoapps/values-prod.yaml index ced75a9..387be7b 100644 --- a/k8s/argoapps/values-prod.yaml +++ b/k8s/argoapps/values-prod.yaml @@ -25,16 +25,16 @@ secrets: cloudflare: name: "cloudflare-apitoken" -infrastructureCharts: - amd-gpu: - repoURL: "https://radeonopencompute.github.io/k8s-device-plugin/" - targetRevision: "0.10.0" - values: |- - namespace: chart-amd-gpu - labeller: - enabled: true - node-feature-discovery: - repoURL: "https://kubernetes-sigs.github.io/node-feature-discovery/charts" - targetRevision: "0.10.0" - values: |- - namespace: chart-node-feature-discovery \ No newline at end of file +# infrastructureCharts: +# amd-gpu: +# repoURL: "https://radeonopencompute.github.io/k8s-device-plugin/" +# targetRevision: "0.10.0" +# values: |- +# namespace: chart-amd-gpu +# labeller: +# enabled: true +# node-feature-discovery: +# repoURL: "https://kubernetes-sigs.github.io/node-feature-discovery/charts" +# targetRevision: "0.10.0" +# values: |- +# namespace: chart-node-feature-discovery \ No newline at end of file diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index a9aaf5d..3256cd4 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -25,6 +25,8 @@ global: port: 1883 host: 192.168.0.23 +videohosting: {} + apps: webapps: valuesFile: webapps.yaml @@ -73,15 +75,15 @@ apps: smtp_password_secret: {{ .Values.secrets.smtp.secrets.smtp.name }} smtp_password_secret_key: password - frigate: - values: |- - persistence: - media_path: - enabled: true - claimName: {{ .Values.storage.frigateMedia.name }} - conf_path: - enabled: true - claimName: {{ .Values.storage.frigateConf.name }} + # frigate: + # values: |- + # persistence: + # media_path: + # enabled: true + # claimName: {{ .Values.storage.frigateMedia.name }} + # conf_path: + # enabled: true + # claimName: {{ .Values.storage.frigateConf.name }} infrastructureCharts: cert-manager: From c48eb7dc27f116b5b15d3bd242044a107927a91a Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 10:48:01 -0500 Subject: [PATCH 42/78] fixing videohosting --- k8s/argoapps/values.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index 3256cd4..7fe7965 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -25,8 +25,6 @@ global: port: 1883 host: 192.168.0.23 -videohosting: {} - apps: webapps: valuesFile: webapps.yaml @@ -51,8 +49,7 @@ apps: server: {{ .Values.global.nfs.server }} videohosting: - values: |- - {{ .Values.videohosting | toYaml }} + values: "" nextcloud: valuesFile: nextcloud.yaml From f804e31cab1a2275f8b295e540cc923f82c3ddf4 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 10:48:52 -0500 Subject: [PATCH 43/78] fixing ingress for videohosting --- k8s/argoapps/apps-values/ingresses.yaml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/k8s/argoapps/apps-values/ingresses.yaml b/k8s/argoapps/apps-values/ingresses.yaml index 8014be3..79d32d0 100644 --- a/k8s/argoapps/apps-values/ingresses.yaml +++ b/k8s/argoapps/apps-values/ingresses.yaml @@ -107,15 +107,6 @@ services: # namespace: "apps-photos" # middleware: "apps-ingresses-chain-authentik" # group: "Apps" - # vh services - {{- range $k, $v := .Values.videohosting.services }} - - prefix: "{{ $k }}.vh" - service: "{{ $k }}" - namespace: "apps-videohosting" - port: {{ $v.ports.tcp.web }} - middleware: "apps-ingresses-chain-authentik" - group: "Video Hosting" - {{- end }} # webapp services {{- $webapps := .Files.Get (printf "apps-values/%s" .Values.apps.webapps.valuesFile) }} {{- $webapps := tpl $webapps . | fromYaml }} From 8739537293ac02241b2c9ed09a804fc1dab411b3 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 10:49:42 -0500 Subject: [PATCH 44/78] removed qbit for k8s --- k8s/apps/videohosting/values.yaml | 44 +++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/k8s/apps/videohosting/values.yaml b/k8s/apps/videohosting/values.yaml index 37e69b9..cac838a 100644 --- a/k8s/apps/videohosting/values.yaml +++ b/k8s/apps/videohosting/values.yaml @@ -183,25 +183,25 @@ services: ports: tcp: web: 9117 - qbittorrent: - repo: linuxserver/qbittorrent - tag: libtorrentv1 - ports: - tcp: - web: 8080 - 6881: 6881 - udp: - 6881: 6881 - podResources: - limits: - memory: "6Gi" - requests: - cpu: 800m - memory: "4Gi" - health: - enabled: true - configVolumesResources: - requests: - storage: 10Gi - limits: - storage: 100Gi + # qbittorrent: + # repo: linuxserver/qbittorrent + # tag: libtorrentv1 + # ports: + # tcp: + # web: 8080 + # 6881: 6881 + # udp: + # 6881: 6881 + # podResources: + # limits: + # memory: "6Gi" + # requests: + # cpu: 800m + # memory: "4Gi" + # health: + # enabled: true + # configVolumesResources: + # requests: + # storage: 10Gi + # limits: + # storage: 100Gi From 5d41b33deccc03c9f34f1294131d5be7fd4543bb Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 10:52:57 -0500 Subject: [PATCH 45/78] grafana health check --- k8s/apps/ingresses/templates/_helpers/ingress.yaml | 2 +- k8s/argoapps/apps-values/ingresses.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/k8s/apps/ingresses/templates/_helpers/ingress.yaml b/k8s/apps/ingresses/templates/_helpers/ingress.yaml index 4b72ab2..c403224 100644 --- a/k8s/apps/ingresses/templates/_helpers/ingress.yaml +++ b/k8s/apps/ingresses/templates/_helpers/ingress.yaml @@ -80,7 +80,7 @@ metadata: gethomepage.dev/enabled: "true" gethomepage.dev/name: "{{.prefix}}@{{.namespace}}" gethomepage.dev/name: "{{.prefix}}@{{.namespace}}" - gethomepage.dev/siteMonitor: 'http://{{.service}}.{{ .namespace }}.svc.cluster.local:{{.port | default 80}}{{ .path | default "/" }}' + gethomepage.dev/siteMonitor: 'http://{{.service}}.{{ .namespace }}.svc.cluster.local:{{.port | default 80}}{{ .path | default "/" }}{{ .health | default "" }}' # gethomepage.dev/description: {{ .description | default "" }} gethomepage.dev/group: {{ .group | default "Unassigned" }} {{ if .icon }} diff --git a/k8s/argoapps/apps-values/ingresses.yaml b/k8s/argoapps/apps-values/ingresses.yaml index 79d32d0..1a9ba17 100644 --- a/k8s/argoapps/apps-values/ingresses.yaml +++ b/k8s/argoapps/apps-values/ingresses.yaml @@ -30,6 +30,7 @@ services: middleware: "apps-ingresses-chain-authentik" group: "Core" icon: "https://grafana.core.home.sosnovsky.ca/public/img/fav32.png" + health: "healthz" - prefix: "authentik.core" service: "authentik" namespace: "chart-authentik" From 2a9b7a19b1d5e6d7559347aeb5f4fc4c6b6b6c0a Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 11:05:56 -0500 Subject: [PATCH 46/78] fixed services refs --- k8s/argoapps/chart-values/homepage.yaml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/k8s/argoapps/chart-values/homepage.yaml b/k8s/argoapps/chart-values/homepage.yaml index 6128abb..2453b03 100644 --- a/k8s/argoapps/chart-values/homepage.yaml +++ b/k8s/argoapps/chart-values/homepage.yaml @@ -18,18 +18,26 @@ config: services: - Local Cameras: - Korie: - href: http://korie.amc.cam.local/ + href: http://korie.cam.internal/ - Eddie: - href: http://eddie.amc.cam.local/ + href: http://eddie.cam.internal/ - Living Room: - href: http://lr.tapo.cam.local/ + href: http://livingroom.cam.internal/ + - Doorbell: + href: 'http://doorbell.cam.internal' + - Garage: + href: 'http://garage.cam.internal' - Routers: - GL Main: - href: http://gl.router.local + href: http://gl.router.internal - GL Basement: - href: http://basement.router.local - - TPlink Main: - href: http://tp.router.local + href: http://gl-basement.router.internal + - MainMesh: + href: http://velica-main.router.internal + - MeshNode1: + href: http://velica-node1.router.internal + - MeshNode2: + href: http://velica-node2.router.internal bookmarks: [] kubernetes: mode: cluster From bfb7cb8643a63a9d0a1f73ac3f34a0a981d6f1df Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 11:06:51 -0500 Subject: [PATCH 47/78] siteMonitor for services --- k8s/argoapps/chart-values/homepage.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/k8s/argoapps/chart-values/homepage.yaml b/k8s/argoapps/chart-values/homepage.yaml index 2453b03..dddb3f2 100644 --- a/k8s/argoapps/chart-values/homepage.yaml +++ b/k8s/argoapps/chart-values/homepage.yaml @@ -19,25 +19,35 @@ config: - Local Cameras: - Korie: href: http://korie.cam.internal/ + siteMonitor: http://korie.cam.internal/ - Eddie: href: http://eddie.cam.internal/ + siteMonitor: http://eddie.cam.internal/ - Living Room: href: http://livingroom.cam.internal/ + siteMonitor: http://livingroom.cam.internal/ - Doorbell: href: 'http://doorbell.cam.internal' + siteMonitor: http://doorbell.cam.internal/ - Garage: href: 'http://garage.cam.internal' + siteMonitor: http://garage.cam.internal/ - Routers: - GL Main: href: http://gl.router.internal + siteMonitor: http://gl.router.internal - GL Basement: href: http://gl-basement.router.internal + siteMonitor: http://gl-basement.router.internal - MainMesh: href: http://velica-main.router.internal + siteMonitor: http://velica-main.router.internal - MeshNode1: href: http://velica-node1.router.internal + siteMonitor: http://velica-node1.router.internal - MeshNode2: href: http://velica-node2.router.internal + siteMonitor: http://velica-node2.router.internal bookmarks: [] kubernetes: mode: cluster From 8edf4002902a5fcde88ddc3b19d04020095c1fff Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 11:18:55 -0500 Subject: [PATCH 48/78] using latest --- k8s/apps/videohosting/values.yaml | 55 +++---------------------------- 1 file changed, 5 insertions(+), 50 deletions(-) diff --git a/k8s/apps/videohosting/values.yaml b/k8s/apps/videohosting/values.yaml index cac838a..88f7fc8 100644 --- a/k8s/apps/videohosting/values.yaml +++ b/k8s/apps/videohosting/values.yaml @@ -26,7 +26,7 @@ jellyfin: memory: "4Gi" arrs: - sonarr: + bazarr: repo: lscr.io/linuxserver/bazarr tag: "latest" migrateDbFromSqllite: @@ -45,13 +45,13 @@ arrs: limits: storage: 100Gi extraConfigXml: |- - Sosnovsky Sonarr + Sosnovsky Bazarr External DisabledForLocalAddresses sonarr: repo: lscr.io/linuxserver/sonarr - tag: "4.0.0-develop" + tag: "latest" migrateDbFromSqllite: enabled: false claimName: config-sonarr-0 @@ -118,7 +118,7 @@ arrs: prowlarr: repo: lscr.io/linuxserver/prowlarr - tag: "1.9.4" + tag: "latest" migrateDbFromSqllite: enabled: false claimName: config-prowlarr-0 @@ -159,49 +159,4 @@ services: memory: "500M" requests: cpu: 50m - memory: "500M" - jackett: - disabled: true - repo: lscr.io/linuxserver/jackett - tag: "latest" - envVars: - AUTO_UPDATE: "true" - podResources: - limits: - memory: "1Gi" - requests: - cpu: 250m - memory: "500M" - health: - readiness: "/health" - liveness: "/health" - configVolumesResources: - requests: - storage: 10Gi - limits: - storage: 100Gi - ports: - tcp: - web: 9117 - # qbittorrent: - # repo: linuxserver/qbittorrent - # tag: libtorrentv1 - # ports: - # tcp: - # web: 8080 - # 6881: 6881 - # udp: - # 6881: 6881 - # podResources: - # limits: - # memory: "6Gi" - # requests: - # cpu: 800m - # memory: "4Gi" - # health: - # enabled: true - # configVolumesResources: - # requests: - # storage: 10Gi - # limits: - # storage: 100Gi + memory: "500M" \ No newline at end of file From 626dd3079099108d145298b061e64eefade08c0e Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 11:19:32 -0500 Subject: [PATCH 49/78] gradual update --- k8s/apps/videohosting/templates/sts-arrs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/apps/videohosting/templates/sts-arrs.yaml b/k8s/apps/videohosting/templates/sts-arrs.yaml index 1a7a56b..c5bca28 100644 --- a/k8s/apps/videohosting/templates/sts-arrs.yaml +++ b/k8s/apps/videohosting/templates/sts-arrs.yaml @@ -117,7 +117,7 @@ spec: revisionHistoryLimit: 2 updateStrategy: rollingUpdate: - partition: 0 + partition: 1 type: RollingUpdate volumeClaimTemplates: - metadata: From d33ee68d2f3bdcd47901057286c3ceca78b4f70e Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 11:21:30 -0500 Subject: [PATCH 50/78] bazarr dbusers --- k8s/apps/db-users/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/k8s/apps/db-users/values.yaml b/k8s/apps/db-users/values.yaml index e0ed3c2..102fc30 100644 --- a/k8s/apps/db-users/values.yaml +++ b/k8s/apps/db-users/values.yaml @@ -13,6 +13,7 @@ userGeneration: sonarr: [log, cache] prowlarr: [log, cache] readarr: [log, cache] + bazarr: [log, cache] postgresSecret: "" From 252a7b14bf5ae5bf8703e53c972ee4544d7db042 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 11:23:57 -0500 Subject: [PATCH 51/78] bazarr user --- k8s/apps/db-users/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/k8s/apps/db-users/values.yaml b/k8s/apps/db-users/values.yaml index 102fc30..bcfbcbb 100644 --- a/k8s/apps/db-users/values.yaml +++ b/k8s/apps/db-users/values.yaml @@ -8,6 +8,7 @@ userGeneration: - prowlarr - immich - readarr + - bazarr users_dbs: radarr: [log, cache] sonarr: [log, cache] From 26da99b126ddee12a23e4e5c8cf7caf8433e4d7b Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 11:25:27 -0500 Subject: [PATCH 52/78] explicit version # develop-0.3.18.2411-ls88 --- k8s/apps/videohosting/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/apps/videohosting/values.yaml b/k8s/apps/videohosting/values.yaml index 88f7fc8..de32cc4 100644 --- a/k8s/apps/videohosting/values.yaml +++ b/k8s/apps/videohosting/values.yaml @@ -97,7 +97,7 @@ arrs: readarr: repo: lscr.io/linuxserver/readarr - tag: "nightly" + tag: "develop-0.3.18.2411-ls88" migrateDbFromSqllite: enabled: false usePostgres: true From a56a3c77c8776a468cc61bbffb4c28a5ffe8f217 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 11:27:36 -0500 Subject: [PATCH 53/78] explicit latest version setting --- k8s/apps/videohosting/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/k8s/apps/videohosting/values.yaml b/k8s/apps/videohosting/values.yaml index de32cc4..a2089b0 100644 --- a/k8s/apps/videohosting/values.yaml +++ b/k8s/apps/videohosting/values.yaml @@ -28,7 +28,7 @@ jellyfin: arrs: bazarr: repo: lscr.io/linuxserver/bazarr - tag: "latest" + tag: "v1.4.1-ls238" migrateDbFromSqllite: enabled: false claimName: config-sonarr-0 @@ -51,7 +51,7 @@ arrs: sonarr: repo: lscr.io/linuxserver/sonarr - tag: "latest" + tag: "4.0.1.929-ls225" migrateDbFromSqllite: enabled: false claimName: config-sonarr-0 @@ -74,7 +74,7 @@ arrs: radarr: repo: lscr.io/linuxserver/radarr - tag: "latest" + tag: "5.2.6.8376-ls203" migrateDbFromSqllite: enabled: false claimName: config-radarr-0 @@ -118,7 +118,7 @@ arrs: prowlarr: repo: lscr.io/linuxserver/prowlarr - tag: "latest" + tag: "1.13.3.4273-ls53" migrateDbFromSqllite: enabled: false claimName: config-prowlarr-0 From e9554e875214d47fde99a25eccc8f7393f6b3af0 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 11:28:25 -0500 Subject: [PATCH 54/78] bazarr user! --- k8s/apps/db-users/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/apps/db-users/values.yaml b/k8s/apps/db-users/values.yaml index bcfbcbb..cfcf748 100644 --- a/k8s/apps/db-users/values.yaml +++ b/k8s/apps/db-users/values.yaml @@ -1,6 +1,7 @@ userGeneration: tfVersion: "1.3.7" users: + - bazarr - nextcloud - authentik - radarr @@ -8,7 +9,6 @@ userGeneration: - prowlarr - immich - readarr - - bazarr users_dbs: radarr: [log, cache] sonarr: [log, cache] From aeeffa5e07b4b346feaf1742d52930d740474bf5 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 11:32:02 -0500 Subject: [PATCH 55/78] putting bazzar down --- k8s/apps/db-users/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/apps/db-users/values.yaml b/k8s/apps/db-users/values.yaml index cfcf748..bcfbcbb 100644 --- a/k8s/apps/db-users/values.yaml +++ b/k8s/apps/db-users/values.yaml @@ -1,7 +1,6 @@ userGeneration: tfVersion: "1.3.7" users: - - bazarr - nextcloud - authentik - radarr @@ -9,6 +8,7 @@ userGeneration: - prowlarr - immich - readarr + - bazarr users_dbs: radarr: [log, cache] sonarr: [log, cache] From 863e749f4dd8a7ac60e5888a25c1e673205167d1 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 11:33:07 -0500 Subject: [PATCH 56/78] before-hook-creation --- k8s/apps/db-users/templates/users-job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/apps/db-users/templates/users-job.yaml b/k8s/apps/db-users/templates/users-job.yaml index c88cbe8..1688fbf 100644 --- a/k8s/apps/db-users/templates/users-job.yaml +++ b/k8s/apps/db-users/templates/users-job.yaml @@ -10,7 +10,7 @@ metadata: checksum/users-tfvars: "{{ (print "db_users = " ( .Values.userGeneration.users | toJson )) | sha256sum }}" checksum/users_dbs-tfvars: "{{ (print "db_users_dbs = " ( .Values.userGeneration.users_dbs | toJson )) | sha256sum }}" helm.sh/hook: post-install - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: before-hook-creation spec: template: metadata: From 10235b118f71523397dbb7164fcf9786936adba0 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 11:36:52 -0500 Subject: [PATCH 57/78] setting port for bazarr --- k8s/apps/videohosting/templates/sts-arrs.yaml | 2 +- k8s/apps/videohosting/values.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/k8s/apps/videohosting/templates/sts-arrs.yaml b/k8s/apps/videohosting/templates/sts-arrs.yaml index c5bca28..678f634 100644 --- a/k8s/apps/videohosting/templates/sts-arrs.yaml +++ b/k8s/apps/videohosting/templates/sts-arrs.yaml @@ -158,7 +158,7 @@ spec: resources: {{- $v.podResources | toYaml | nindent 12 }} ports: - - containerPort: 80 + - containerPort: {{ .port | default 80 }} name: "http" - containerPort: 443 name: "https" diff --git a/k8s/apps/videohosting/values.yaml b/k8s/apps/videohosting/values.yaml index a2089b0..6b37dd6 100644 --- a/k8s/apps/videohosting/values.yaml +++ b/k8s/apps/videohosting/values.yaml @@ -29,6 +29,7 @@ arrs: bazarr: repo: lscr.io/linuxserver/bazarr tag: "v1.4.1-ls238" + port: 6767 migrateDbFromSqllite: enabled: false claimName: config-sonarr-0 From 42ebfc65869db169745e312ba6361874af0f4969 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 11:38:54 -0500 Subject: [PATCH 58/78] bazarr svc --- k8s/argoapps/apps-values/ingresses.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/k8s/argoapps/apps-values/ingresses.yaml b/k8s/argoapps/apps-values/ingresses.yaml index 1a9ba17..b4097c4 100644 --- a/k8s/argoapps/apps-values/ingresses.yaml +++ b/k8s/argoapps/apps-values/ingresses.yaml @@ -83,6 +83,11 @@ services: middleware: "apps-ingresses-chain-authentik" port: 3000 group: "Core" + - prefix: "bazarr.vh" + service: "bazarr" + namespace: "apps-videohosting" + middleware: "apps-ingresses-chain-authentik" + group: "Video Hosting" - prefix: "radarr.vh" service: "radarr" namespace: "apps-videohosting" From fb0fd9a001ffc313ba6cadb7e387f3cc5d482f8c Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 11:42:08 -0500 Subject: [PATCH 59/78] override target port --- k8s/apps/videohosting/templates/sts-arrs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/apps/videohosting/templates/sts-arrs.yaml b/k8s/apps/videohosting/templates/sts-arrs.yaml index 678f634..18301cc 100644 --- a/k8s/apps/videohosting/templates/sts-arrs.yaml +++ b/k8s/apps/videohosting/templates/sts-arrs.yaml @@ -92,7 +92,7 @@ spec: type: ClusterIP ports: - port: 80 - targetPort: 80 + targetPort: {{ .port | default 80 }} name: "http" - port: 443 targetPort: 443 From f96188e784267a574f880cbb2af41589f4a420b2 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 12:05:27 -0500 Subject: [PATCH 60/78] using bazarr as a ervice --- .../templates/configs-bazarr.yaml | 39 +++++++++++++++++ .../templates/configs-openvpn.yaml | 20 --------- .../videohosting/templates/sts-services.yaml | 4 ++ k8s/apps/videohosting/values.yaml | 42 ++++++++----------- 4 files changed, 61 insertions(+), 44 deletions(-) create mode 100644 k8s/apps/videohosting/templates/configs-bazarr.yaml delete mode 100644 k8s/apps/videohosting/templates/configs-openvpn.yaml diff --git a/k8s/apps/videohosting/templates/configs-bazarr.yaml b/k8s/apps/videohosting/templates/configs-bazarr.yaml new file mode 100644 index 0000000..f0426a6 --- /dev/null +++ b/k8s/apps/videohosting/templates/configs-bazarr.yaml @@ -0,0 +1,39 @@ +--- +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: "bazarr-db-creds" +spec: + refreshInterval: 24h + secretStoreRef: + kind: ClusterSecretStore + name: chart-db-creds + target: + name: "bazarr-config" + creationPolicy: Owner + template: + engineVersion: v2 + data: + POSTGRES_ENABLED: "true" + POSTGRES_HOST: "{{ `{{.host}}` }}" + POSTGRES_PORT: "{{ `{{.port}}` }}" + POSTGRES_DATABASE: "{{ `{{.username}}` }}" + POSTGRES_USERNAME: "{{ `{{.username}}` }}" + POSTGRES_PASSWORD: "{{ `{{.password}}` }}" + data: + - remoteRef: + key: password.pg.{{$k}} + property: username + secretKey: username + - remoteRef: + key: password.pg.{{$k}} + property: password + secretKey: password + - remoteRef: + key: password.pg.{{$k}} + property: port + secretKey: port + - remoteRef: + key: password.pg.{{$k}} + property: host + secretKey: host \ No newline at end of file diff --git a/k8s/apps/videohosting/templates/configs-openvpn.yaml b/k8s/apps/videohosting/templates/configs-openvpn.yaml deleted file mode 100644 index ab99d41..0000000 --- a/k8s/apps/videohosting/templates/configs-openvpn.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -apiVersion: v1 -kind: Secret -metadata: - name: openvpn-creds -type: Opaque -data: - _placeholder: "" - ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: openvpn-route-script -data: - route-override.sh: |- - #!/bin/sh - VPN_GATEWAY=$(route -n | awk 'NR==3' | awk '{ print $2 }') - ip route del 0.0.0.0/1 via $VPN_GATEWAY - echo "Route Updated" \ No newline at end of file diff --git a/k8s/apps/videohosting/templates/sts-services.yaml b/k8s/apps/videohosting/templates/sts-services.yaml index 9ef930b..c94dc3a 100644 --- a/k8s/apps/videohosting/templates/sts-services.yaml +++ b/k8s/apps/videohosting/templates/sts-services.yaml @@ -93,6 +93,10 @@ spec: envFrom: - configMapRef: name: {{$k}}-envs + {{ if $v.envFrom }} + {{ range $envFrom := $v.envFrom }} + - {{ $envFrom | toJson }} + {{ end }} resources: {{- $v.podResources | toYaml | nindent 12 }} {{ if $v.ports}} diff --git a/k8s/apps/videohosting/values.yaml b/k8s/apps/videohosting/values.yaml index 6b37dd6..0ec17b8 100644 --- a/k8s/apps/videohosting/values.yaml +++ b/k8s/apps/videohosting/values.yaml @@ -26,30 +26,6 @@ jellyfin: memory: "4Gi" arrs: - bazarr: - repo: lscr.io/linuxserver/bazarr - tag: "v1.4.1-ls238" - port: 6767 - migrateDbFromSqllite: - enabled: false - claimName: config-sonarr-0 - usePostgres: true - podResources: - limits: - memory: "8Gi" - requests: - cpu: 250m - memory: "500M" - configVolumesResources: - requests: - storage: 10Gi - limits: - storage: 100Gi - extraConfigXml: |- - Sosnovsky Bazarr - External - DisabledForLocalAddresses - sonarr: repo: lscr.io/linuxserver/sonarr tag: "4.0.1.929-ls225" @@ -141,6 +117,24 @@ arrs: DisabledForLocalAddresses services: + bazarr: + kind: StatefulSet + repo: lscr.io/linuxserver/bazarr + tag: "v1.4.1-ls238" + ports: + web: + http: 6767 + health: {} + envFrom: + - secretRef: + name: bazarr-db-creds + podResources: + limits: + memory: "8Gi" + requests: + cpu: 250m + memory: "500M" + jellyplex: kind: Deployment disableSVC: true From a7e7890140edb2f12f9c4cd83e5dd287f1e018a4 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 12:10:33 -0500 Subject: [PATCH 61/78] fixing config --- k8s/apps/videohosting/templates/configs-bazarr.yaml | 8 ++++---- k8s/apps/videohosting/templates/sts-services.yaml | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/k8s/apps/videohosting/templates/configs-bazarr.yaml b/k8s/apps/videohosting/templates/configs-bazarr.yaml index f0426a6..bf31748 100644 --- a/k8s/apps/videohosting/templates/configs-bazarr.yaml +++ b/k8s/apps/videohosting/templates/configs-bazarr.yaml @@ -22,18 +22,18 @@ spec: POSTGRES_PASSWORD: "{{ `{{.password}}` }}" data: - remoteRef: - key: password.pg.{{$k}} + key: password.pg.bazarr property: username secretKey: username - remoteRef: - key: password.pg.{{$k}} + key: password.pg.bazarr property: password secretKey: password - remoteRef: - key: password.pg.{{$k}} + key: password.pg.bazarr property: port secretKey: port - remoteRef: - key: password.pg.{{$k}} + key: password.pg.bazarr property: host secretKey: host \ No newline at end of file diff --git a/k8s/apps/videohosting/templates/sts-services.yaml b/k8s/apps/videohosting/templates/sts-services.yaml index c94dc3a..56eeeca 100644 --- a/k8s/apps/videohosting/templates/sts-services.yaml +++ b/k8s/apps/videohosting/templates/sts-services.yaml @@ -93,8 +93,7 @@ spec: envFrom: - configMapRef: name: {{$k}}-envs - {{ if $v.envFrom }} - {{ range $envFrom := $v.envFrom }} + {{ range $envFrom := ($v.envFrom | default list) }} - {{ $envFrom | toJson }} {{ end }} resources: From 0937e87079f3172150c9cf005df2c4f27115c7fe Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 12:13:12 -0500 Subject: [PATCH 62/78] correct port use --- k8s/apps/videohosting/values.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/k8s/apps/videohosting/values.yaml b/k8s/apps/videohosting/values.yaml index 0ec17b8..e057c45 100644 --- a/k8s/apps/videohosting/values.yaml +++ b/k8s/apps/videohosting/values.yaml @@ -122,8 +122,9 @@ services: repo: lscr.io/linuxserver/bazarr tag: "v1.4.1-ls238" ports: - web: - http: 6767 + tcp: + web: + http: 6767 health: {} envFrom: - secretRef: From 08666d23ef9f5940bd2cf19f92de980c269026b9 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 12:13:40 -0500 Subject: [PATCH 63/78] port fix --- k8s/apps/videohosting/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/k8s/apps/videohosting/values.yaml b/k8s/apps/videohosting/values.yaml index e057c45..1b44834 100644 --- a/k8s/apps/videohosting/values.yaml +++ b/k8s/apps/videohosting/values.yaml @@ -123,8 +123,7 @@ services: tag: "v1.4.1-ls238" ports: tcp: - web: - http: 6767 + web: 6767 health: {} envFrom: - secretRef: From efcaa361164660155e116d2c636cc4d80df00acb Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 12:19:57 -0500 Subject: [PATCH 64/78] correct secrets --- k8s/apps/videohosting/templates/configs-bazarr.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/k8s/apps/videohosting/templates/configs-bazarr.yaml b/k8s/apps/videohosting/templates/configs-bazarr.yaml index bf31748..d9ea7db 100644 --- a/k8s/apps/videohosting/templates/configs-bazarr.yaml +++ b/k8s/apps/videohosting/templates/configs-bazarr.yaml @@ -7,9 +7,9 @@ spec: refreshInterval: 24h secretStoreRef: kind: ClusterSecretStore - name: chart-db-creds + name: chart-database target: - name: "bazarr-config" + name: "bazarr-db-creds" creationPolicy: Owner template: engineVersion: v2 From 91d1a4ebf1be3dffea863b079be9e1dfe97b5d11 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 12:38:18 -0500 Subject: [PATCH 65/78] clean up --- k8s/apps/frigate/Chart.yaml | 7 -- k8s/apps/frigate/templates/dep-frigate.yaml | 99 --------------- k8s/apps/frigate/templates/dep-go2rtc.yaml | 72 ----------- k8s/apps/frigate/templates/dep-scrypted.yaml | 123 ------------------- k8s/apps/frigate/templates/lb.yaml | 51 -------- k8s/apps/frigate/templates/np.yaml | 35 ------ k8s/apps/frigate/templates/service.yaml | 85 ------------- k8s/apps/frigate/values-dev.yaml | 0 k8s/apps/frigate/values-prod.yaml | 5 - k8s/apps/frigate/values.yaml | 46 ------- k8s/argoapps/apps-values/ingresses.yaml | 17 --- k8s/argoapps/values.yaml | 30 ----- 12 files changed, 570 deletions(-) delete mode 100644 k8s/apps/frigate/Chart.yaml delete mode 100644 k8s/apps/frigate/templates/dep-frigate.yaml delete mode 100644 k8s/apps/frigate/templates/dep-go2rtc.yaml delete mode 100644 k8s/apps/frigate/templates/dep-scrypted.yaml delete mode 100644 k8s/apps/frigate/templates/lb.yaml delete mode 100644 k8s/apps/frigate/templates/np.yaml delete mode 100644 k8s/apps/frigate/templates/service.yaml delete mode 100644 k8s/apps/frigate/values-dev.yaml delete mode 100644 k8s/apps/frigate/values-prod.yaml delete mode 100644 k8s/apps/frigate/values.yaml diff --git a/k8s/apps/frigate/Chart.yaml b/k8s/apps/frigate/Chart.yaml deleted file mode 100644 index 83360f3..0000000 --- a/k8s/apps/frigate/Chart.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v2 -name: frigate -description: An apps service for homelab -type: application -version: 0.1.0 -appVersion: "edge" -dependencies: [] diff --git a/k8s/apps/frigate/templates/dep-frigate.yaml b/k8s/apps/frigate/templates/dep-frigate.yaml deleted file mode 100644 index 538bd38..0000000 --- a/k8s/apps/frigate/templates/dep-frigate.yaml +++ /dev/null @@ -1,99 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "frigate" -spec: - replicas: 1 - revisionHistoryLimit: 3 - strategy: - type: Recreate - selector: - matchLabels: - homelab/app: frigate - template: - metadata: - labels: - homelab/app: frigate - spec: - {{- if .Values.nodeSelector }} - nodeSelector: - {{- .Values.nodeSelector | toYaml | nindent 8}} - {{- end }} - volumes: - {{- if .Values.persistence.media_path.enabled }} - - name: media-path - persistentVolumeClaim: - claimName: {{ .Values.persistence.media_path.claimName }} - {{- end }} - {{- if .Values.persistence.conf_path.enabled }} - - name: conf-path - persistentVolumeClaim: - claimName: {{ .Values.persistence.conf_path.claimName }} - {{- end }} - {{- if .Values.coral.enabled }} - - name: coral-dev - hostPath: - path: {{ .Values.coral.hostPath }} - {{- end }} - - name: dshm - emptyDir: - medium: Memory - containers: - - name: frigate - imagePullPolicy: "Always" - securityContext: - privileged: true - image: "{{ .Values.images.frigate.repo }}:{{ .Values.images.frigate.tag | default .Chart.AppVersion }}" - resources: - {{- .Values.resources.frigate | toYaml | nindent 14}} - livenessProbe: - httpGet: - path: / - port: http - scheme: HTTP - initialDelaySeconds: 10 - failureThreshold: 10 - timeoutSeconds: 30 - readinessProbe: - httpGet: - path: / - port: http - scheme: HTTP - initialDelaySeconds: 10 - failureThreshold: 10 - timeoutSeconds: 30 - startupProbe: - httpGet: - path: / - port: http - scheme: HTTP - failureThreshold: 60 - periodSeconds: 15 - ports: - - containerPort: 5000 - name: http - - containerPort: 8554 - name: rtsp - - containerPort: 8555 - name: webrtc-tcp - protocol: TCP - - containerPort: 8555 - name: webrtc-udp - protocol: UDP - volumeMounts: - {{- if .Values.persistence.media_path.enabled }} - - name: media-path - mountPath: /media/frigate - {{ end }} - {{- if .Values.persistence.conf_path.enabled }} - - name: conf-path - mountPath: /config - subPath: frigate - {{ end }} - {{- if .Values.coral.enabled }} - - mountPath: {{ .Values.coral.hostPath }} - name: coral-dev - {{- end }} - - mountPath: /dev/shm - name: dshm diff --git a/k8s/apps/frigate/templates/dep-go2rtc.yaml b/k8s/apps/frigate/templates/dep-go2rtc.yaml deleted file mode 100644 index 4c94fab..0000000 --- a/k8s/apps/frigate/templates/dep-go2rtc.yaml +++ /dev/null @@ -1,72 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "go2rtc" -spec: - replicas: 1 - revisionHistoryLimit: 3 - strategy: - type: Recreate - selector: - matchLabels: - homelab/app: go2rtc - template: - metadata: - labels: - homelab/app: go2rtc - spec: - volumes: - {{- if .Values.persistence.conf_path.enabled }} - - name: conf-path - persistentVolumeClaim: - claimName: {{ .Values.persistence.conf_path.claimName }} - {{- end }} - containers: - - name: go2rtc - imagePullPolicy: "Always" - securityContext: - privileged: true - image: "{{ .Values.images.go2rtc.repo }}:{{ .Values.images.go2rtc.tag | default .Chart.AppVersion }}" - resources: - {{- .Values.resources.go2rtc | toYaml | nindent 14}} - livenessProbe: - httpGet: - path: / - port: http - scheme: HTTP - initialDelaySeconds: 10 - failureThreshold: 10 - timeoutSeconds: 30 - readinessProbe: - httpGet: - path: / - port: http - scheme: HTTP - initialDelaySeconds: 10 - failureThreshold: 10 - timeoutSeconds: 30 - startupProbe: - httpGet: - path: / - port: http - scheme: HTTP - failureThreshold: 60 - periodSeconds: 15 - ports: - - containerPort: 1984 - name: http - - containerPort: 8554 - name: rtsp - - containerPort: 8555 - name: webrtc-tcp - protocol: TCP - - containerPort: 8555 - name: webrtc-udp - protocol: UDP - volumeMounts: - {{- if .Values.persistence.conf_path.enabled }} - - name: conf-path - mountPath: /config - subPath: go2rtc - {{ end }} diff --git a/k8s/apps/frigate/templates/dep-scrypted.yaml b/k8s/apps/frigate/templates/dep-scrypted.yaml deleted file mode 100644 index 116e08a..0000000 --- a/k8s/apps/frigate/templates/dep-scrypted.yaml +++ /dev/null @@ -1,123 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "scrypted" -spec: - replicas: 1 - revisionHistoryLimit: 2 - strategy: - type: Recreate - selector: - matchLabels: - homelab/app: scrypted - template: - metadata: - labels: - homelab/app: scrypted - spec: - {{- if .Values.nodeSelector }} - nodeSelector: - {{- .Values.nodeSelector | toYaml | nindent 8}} - {{- end }} - volumes: - {{- if .Values.persistence.media_path.enabled }} - - name: media-path - persistentVolumeClaim: - claimName: {{ .Values.persistence.media_path.claimName }} - {{- end }} - {{- if .Values.persistence.conf_path.enabled }} - - name: conf-path - persistentVolumeClaim: - claimName: {{ .Values.persistence.conf_path.claimName }} - {{- end }} - {{- if .Values.coral.enabledForScrypted }} - - name: coral-dev - hostPath: - path: {{ .Values.coral.hostPath }} - {{- end }} - - name: dshm - emptyDir: - medium: Memory - containers: - - name: scrypted - imagePullPolicy: "Always" - securityContext: - privileged: true - image: "{{ .Values.images.scrypted.repo }}:{{ .Values.images.scrypted.tag | default .Chart.AppVersion }}" - resources: - {{- .Values.resources.scrypted | toYaml | nindent 14}} - livenessProbe: - httpGet: - path: / - port: http - scheme: HTTP - initialDelaySeconds: 10 - failureThreshold: 10 - timeoutSeconds: 30 - readinessProbe: - httpGet: - path: / - port: http - scheme: HTTP - initialDelaySeconds: 10 - failureThreshold: 10 - timeoutSeconds: 30 - startupProbe: - httpGet: - path: / - port: http - scheme: HTTP - failureThreshold: 60 - periodSeconds: 15 - ports: - - containerPort: 80 - name: http - - containerPort: 443 - name: https - - containerPort: 8080 - name: debug - - containerPort: 554 - name: rtsp-tcp - protocol: TCP - - containerPort: 554 - name: rtsp-udp - protocol: UDP - - containerPort: 47524 - name: homekit - {{ with .Values.scrypted.homekit }} - {{ range $i := (untilStep (int .startPort) (int .endPort) 1) }} - - containerPort: {{$i}} - name: homekit-{{$i}} - {{ end }} - {{ end }} - env: - - name: SCRYPTED_NVR_VOLUME - value: /nvr - - name: SCRYPTED_DISABLE_AUTHENTICATION - value: 'true' - - name: SCRYPTED_INSECURE_PORT - value: '80' - - name: SCRYPTED_SECURE_PORT - value: '443' - - name: SCRYPTED_DEBUG_PORT - value: '8080' - - name: SCRYPTED_DOCKER_AVAHI - value: 'true' - volumeMounts: - {{- if .Values.persistence.media_path.enabled }} - - name: media-path - mountPath: /nvr - subPath: scrypted - {{ end }} - {{- if .Values.persistence.conf_path.enabled }} - - name: conf-path - mountPath: /server/volume - subPath: scrypted - {{ end }} - {{- if .Values.coral.enabledForScrypted }} - - mountPath: {{ .Values.coral.hostPath }} - name: coral-dev - {{- end }} - - mountPath: /dev/shm - name: dshm \ No newline at end of file diff --git a/k8s/apps/frigate/templates/lb.yaml b/k8s/apps/frigate/templates/lb.yaml deleted file mode 100644 index 560a8df..0000000 --- a/k8s/apps/frigate/templates/lb.yaml +++ /dev/null @@ -1,51 +0,0 @@ ---- -kind: Service -apiVersion: v1 -metadata: - name: go2rtc-lb -spec: - selector: - homelab/app: go2rtc - type: LoadBalancer - ports: - - port: 8554 - targetPort: 8554 - name: rtsp - protocol: TCP - - port: 8555 - targetPort: 8555 - name: webrtc-tcp - protocol: TCP - - port: 8555 - targetPort: 8555 - name: webrtc-udp - protocol: UDP - - port: 1984 - targetPort: 1984 - name: http - protocol: TCP ---- -kind: Service -apiVersion: v1 -metadata: - name: scrypted-lb -spec: - selector: - homelab/app: scrypted - type: LoadBalancer - ports: - - port: 554 - targetPort: 554 - name: rtsp-tcp - protocol: TCP - - port: 554 - targetPort: 554 - name: rtsp-udp - protocol: UDP -{{ with .Values.scrypted.homekit }} - {{ range $i := (untilStep (int .startPort) (int .endPort) 1) }} - - port: {{$i}} - targetPort: {{$i}} - name: homekit-{{$i}} - {{ end }} -{{ end }} \ No newline at end of file diff --git a/k8s/apps/frigate/templates/np.yaml b/k8s/apps/frigate/templates/np.yaml deleted file mode 100644 index 8ccac10..0000000 --- a/k8s/apps/frigate/templates/np.yaml +++ /dev/null @@ -1,35 +0,0 @@ ---- -kind: Service -apiVersion: v1 -metadata: - name: frigate-nodeport -spec: - selector: - homelab/app: frigate - type: NodePort - ports: - - port: 1984 - nodePort: 30001 - targetPort: 1984 - name: go2rtc - protocol: TCP - - port: 5000 - nodePort: 30000 - targetPort: 5000 - name: http - protocol: TCP - - port: 8554 - nodePort: 30554 - targetPort: 8554 - name: rtsp - protocol: TCP - - port: 8555 - nodePort: 30555 - targetPort: 8555 - name: webrtc-tcp - protocol: TCP - - port: 8555 - nodePort: 30555 - targetPort: 8555 - name: webrtc-udp - protocol: UDP \ No newline at end of file diff --git a/k8s/apps/frigate/templates/service.yaml b/k8s/apps/frigate/templates/service.yaml deleted file mode 100644 index f3685e5..0000000 --- a/k8s/apps/frigate/templates/service.yaml +++ /dev/null @@ -1,85 +0,0 @@ ---- -kind: Service -apiVersion: v1 -metadata: - name: frigate -spec: - selector: - homelab/app: frigate - type: ClusterIP - ports: - - port: 80 - targetPort: 5000 - name: http - protocol: TCP - - port: 8554 - targetPort: 8554 - name: rtsp - protocol: TCP - - port: 8555 - targetPort: 8555 - name: webrtc-tcp - protocol: TCP - - port: 8555 - targetPort: 8555 - name: webrtc-udp - protocol: UDP ---- -kind: Service -apiVersion: v1 -metadata: - name: go2rtc -spec: - selector: - homelab/app: go2rtc - type: ClusterIP - ports: - - port: 8554 - targetPort: 8554 - name: rtsp - protocol: TCP - - port: 8555 - targetPort: 8555 - name: webrtc-tcp - protocol: TCP - - port: 8555 - targetPort: 8555 - name: webrtc-udp - protocol: UDP - - port: 80 - targetPort: 1984 - name: http - protocol: TCP ---- -kind: Service -apiVersion: v1 -metadata: - name: scrypted -spec: - selector: - homelab/app: scrypted - type: ClusterIP - ports: - - port: 554 - targetPort: 554 - name: rtsp-tcp - protocol: TCP - - port: 554 - targetPort: 554 - name: rtsp-udp - protocol: UDP - - port: 80 - targetPort: 80 - name: http - protocol: TCP - - port: 443 - targetPort: 443 - name: https - protocol: TCP -{{ with .Values.scrypted.homekit }} - {{ range $i := (untilStep (int .startPort) (int .endPort) 1) }} - - port: {{$i}} - targetPort: {{$i}} - name: homekit-{{$i}} - {{ end }} -{{ end }} \ No newline at end of file diff --git a/k8s/apps/frigate/values-dev.yaml b/k8s/apps/frigate/values-dev.yaml deleted file mode 100644 index e69de29..0000000 diff --git a/k8s/apps/frigate/values-prod.yaml b/k8s/apps/frigate/values-prod.yaml deleted file mode 100644 index f051815..0000000 --- a/k8s/apps/frigate/values-prod.yaml +++ /dev/null @@ -1,5 +0,0 @@ -coral: - enabled: true - -nodeSelector: - "homelab.device/coral": "usb" diff --git a/k8s/apps/frigate/values.yaml b/k8s/apps/frigate/values.yaml deleted file mode 100644 index 6faf299..0000000 --- a/k8s/apps/frigate/values.yaml +++ /dev/null @@ -1,46 +0,0 @@ - - -images: - frigate: - repo: "ghcr.io/blakeblackshear/frigate" - tag: "stable" - go2rtc: - repo: "alexxit/go2rtc" - tag: "latest" - scrypted: - repo: "ghcr.io/koush/scrypted" - tag: "latest" - - -persistence: - media_path: - enabled: false - claimName: "" - conf_path: - enabled: false - claimName: "" - -affinity: {} - -coral: - enabled: false - hostPath: /dev/bus/usb - -resources: - frigate: - requests: - memory: "4Gi" - cpu: "2" - limits: - memory: "4Gi" - go2rtc: - requests: - memory: "100Mi" - cpu: "500m" - limits: - memory: "500Mi" - -scrypted: - homekit: - startPort: 4000 - endPort: 4010 \ No newline at end of file diff --git a/k8s/argoapps/apps-values/ingresses.yaml b/k8s/argoapps/apps-values/ingresses.yaml index b4097c4..497cbe5 100644 --- a/k8s/argoapps/apps-values/ingresses.yaml +++ b/k8s/argoapps/apps-values/ingresses.yaml @@ -60,23 +60,6 @@ services: namespace: "apps-videohosting" port: 8096 group: "Apps" - # - prefix: "frigate" - # service: "frigate" - # namespace: "apps-frigate" - # middleware: "apps-ingresses-chain-authentik" - # group: "Cameras" - # icon: "https://frigate.home.sosnovsky.ca/assets/favicon-92a9ac8b.ico" - # - prefix: "scrypted" - # service: "scrypted" - # namespace: "apps-frigate" - # middleware: "apps-ingresses-chain-authentik" - # group: "Cameras" - # - prefix: "go2rtc" - # service: "go2rtc" - # namespace: "apps-frigate" - # middleware: "apps-ingresses-chain-authentik" - # group: "Cameras" - # icon: "https://frigate.home.sosnovsky.ca/assets/favicon-92a9ac8b.ico" - prefix: "main" service: "homepage" namespace: "chart-homepage" diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index 7fe7965..cd27167 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -72,16 +72,6 @@ apps: smtp_password_secret: {{ .Values.secrets.smtp.secrets.smtp.name }} smtp_password_secret_key: password - # frigate: - # values: |- - # persistence: - # media_path: - # enabled: true - # claimName: {{ .Values.storage.frigateMedia.name }} - # conf_path: - # enabled: true - # claimName: {{ .Values.storage.frigateConf.name }} - infrastructureCharts: cert-manager: repoURL: "https://charts.jetstack.io" @@ -204,23 +194,3 @@ storage: storage: 20Gi requests: storage: 1Gi - frigateMedia: - name: frigate-media - namespace: apps-frigate - accessModes: - - ReadWriteMany - resources: - limits: - storage: 100Gi - requests: - storage: 10Gi - frigateConf: - name: frigate-conf - namespace: apps-frigate - accessModes: - - ReadWriteMany - resources: - limits: - storage: 1Gi - requests: - storage: 100Mi From 1b72b4c2482f93c142abd8105f35d17958d8f5d7 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 12:47:55 -0500 Subject: [PATCH 66/78] ollama support --- k8s/apps/webapps/templates/deploy-apps.yaml | 2 + k8s/apps/webapps/values-dev.yaml | 48 +++++++++++++++++++++ k8s/argoapps/apps-values/webapps.yaml | 29 ++++++++++++- k8s/argoapps/values.yaml | 10 ++++- 4 files changed, 87 insertions(+), 2 deletions(-) diff --git a/k8s/apps/webapps/templates/deploy-apps.yaml b/k8s/apps/webapps/templates/deploy-apps.yaml index 36ea3a3..89c71d7 100644 --- a/k8s/apps/webapps/templates/deploy-apps.yaml +++ b/k8s/apps/webapps/templates/deploy-apps.yaml @@ -49,6 +49,7 @@ spec: operator: In values: {{ $v.capacity | toYaml | nindent 20 }} + volumes: {{ ($v.volumes | default list) | toJson }} containers: - name: {{$k}} image: "{{ $v.repo }}:{{ $v.tag }}" @@ -93,4 +94,5 @@ spec: initialDelaySeconds: 10 failureThreshold: 10 timeoutSeconds: 30 + volumeMounts: {{ ($v.volumeMounts | default list) | toJson }} {{ end }} \ No newline at end of file diff --git a/k8s/apps/webapps/values-dev.yaml b/k8s/apps/webapps/values-dev.yaml index e69de29..329c82e 100644 --- a/k8s/apps/webapps/values-dev.yaml +++ b/k8s/apps/webapps/values-dev.yaml @@ -0,0 +1,48 @@ +apps: + quirky: + ingress: + middleware: apps-ingresses-https-redirect + repo: ghcr.io/asosnovsky/quirky + tag: "latest" + podResources: + limits: + memory: "250Mi" + requests: + cpu: 250m + memory: "250Mi" + health: + readiness: "/" + liveness: "/" + ports: + tcp: + web: 80 + capacity: + - med + - low + ollama: + ingress: + middleware: apps-ingresses-chain-authentik + repo: ollama/ollama + tag: "latest" + podResources: + limits: + memory: "1Gi" + requests: + cpu: 250m + memory: "1Gi" + health: + readiness: "/" + liveness: "/" + ports: + tcp: + web: 11434 + volumes: + - name: config + persistentVolumeClaim: + claimName: pv-ollama + volumeMounts: + - name: config + mountPath: /root/.ollama + capacity: + - med + - high \ No newline at end of file diff --git a/k8s/argoapps/apps-values/webapps.yaml b/k8s/argoapps/apps-values/webapps.yaml index 18eba5f..ffae5ee 100644 --- a/k8s/argoapps/apps-values/webapps.yaml +++ b/k8s/argoapps/apps-values/webapps.yaml @@ -18,4 +18,31 @@ apps: web: 80 capacity: - med - - low \ No newline at end of file + - low + ollama: + ingress: + middleware: apps-ingresses-chain-authentik + repo: ollama/ollama + tag: "latest" + podResources: + limits: + memory: "1Gi" + requests: + cpu: 250m + memory: "1Gi" + health: + readiness: "/" + liveness: "/" + ports: + tcp: + web: 11434 + volumes: + - name: config + persistentVolumeClaim: + claimName: {{ .Values.storage.ollama.name }} + volumeMounts: + - name: config + mountPath: /root/.ollama + capacity: + - med + - high \ No newline at end of file diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index cd27167..6e551b7 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -23,7 +23,7 @@ global: email: "ariel.sosnovsky@gmail.com" mqtt: port: 1883 - host: 192.168.0.23 + host: castle.hub.internal apps: webapps: @@ -164,6 +164,14 @@ storage: resources: requests: storage: 8Gi + ollama: + name: ollama + namespace: apps-webapps + accessModes: + - ReadWriteMany + resources: + requests: + storage: 8Gi nextcloudData: name: nextcloud-data namespace: apps-nextcloud From 30d51dc6f3b22448f810ff1aac76d0aea6e88d34 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 12:58:03 -0500 Subject: [PATCH 67/78] ollama web --- k8s/argoapps/apps-values/webapps.yaml | 32 ++++++++++++++++++++++++++- k8s/argoapps/values.yaml | 8 +++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/k8s/argoapps/apps-values/webapps.yaml b/k8s/argoapps/apps-values/webapps.yaml index ffae5ee..1999ee2 100644 --- a/k8s/argoapps/apps-values/webapps.yaml +++ b/k8s/argoapps/apps-values/webapps.yaml @@ -45,4 +45,34 @@ apps: mountPath: /root/.ollama capacity: - med - - high \ No newline at end of file + - high + ollama-web: + ingress: + middleware: apps-ingresses-chain-authentik + repo: ghcr.io/ollama-webui/ollama-webui + tag: "main" + podResources: + limits: + memory: "1Gi" + requests: + cpu: 250m + memory: "1Gi" + health: + readiness: "/" + liveness: "/" + env: + - name: OLLAMA_API_BASE_URL + value: http://ollama.apps-webapps.svc.cluster.local + ports: + tcp: + web: 8080 + volumes: + - name: config + persistentVolumeClaim: + claimName: {{ .Values.storage.ollamaWebGui.name }} + volumeMounts: + - name: config + mountPath: /app/backend/data + capacity: + - med + - low diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index 6e551b7..e8886f0 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -172,6 +172,14 @@ storage: resources: requests: storage: 8Gi + ollamaWebGui: + name: ollama-web-gui + namespace: apps-webapps + accessModes: + - ReadWriteMany + resources: + requests: + storage: 8Gi nextcloudData: name: nextcloud-data namespace: apps-nextcloud From 9feafbcddc220ca6e1c41c57ec416608840aa279 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 12:59:06 -0500 Subject: [PATCH 68/78] env --- k8s/apps/webapps/templates/deploy-apps.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/k8s/apps/webapps/templates/deploy-apps.yaml b/k8s/apps/webapps/templates/deploy-apps.yaml index 89c71d7..113be83 100644 --- a/k8s/apps/webapps/templates/deploy-apps.yaml +++ b/k8s/apps/webapps/templates/deploy-apps.yaml @@ -94,5 +94,7 @@ spec: initialDelaySeconds: 10 failureThreshold: 10 timeoutSeconds: 30 + envFrom: {{ ($v.envFrom | default list) | toJson }} + env: {{ ($v.env | default list) | toJson }} volumeMounts: {{ ($v.volumeMounts | default list) | toJson }} {{ end }} \ No newline at end of file From c1eb6cd9dfa23e45b05a2244b0caeeb3cc471c35 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 13:01:05 -0500 Subject: [PATCH 69/78] removing probes --- k8s/argoapps/apps-values/webapps.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/k8s/argoapps/apps-values/webapps.yaml b/k8s/argoapps/apps-values/webapps.yaml index 1999ee2..f5fa1a7 100644 --- a/k8s/argoapps/apps-values/webapps.yaml +++ b/k8s/argoapps/apps-values/webapps.yaml @@ -30,9 +30,6 @@ apps: requests: cpu: 250m memory: "1Gi" - health: - readiness: "/" - liveness: "/" ports: tcp: web: 11434 From dd3e3830df1f86ccbd58da8400599acc4dcaa3a1 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 13:01:55 -0500 Subject: [PATCH 70/78] wrap health --- k8s/apps/webapps/templates/deploy-apps.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/k8s/apps/webapps/templates/deploy-apps.yaml b/k8s/apps/webapps/templates/deploy-apps.yaml index 113be83..ddd6447 100644 --- a/k8s/apps/webapps/templates/deploy-apps.yaml +++ b/k8s/apps/webapps/templates/deploy-apps.yaml @@ -68,6 +68,7 @@ spec: protocol: UDP {{ end }} {{ end }} + {{ if $v.health }} {{- if $v.health.liveness }} livenessProbe: httpGet: @@ -88,6 +89,7 @@ spec: failureThreshold: 10 timeoutSeconds: 30 {{ end }} + {{ end }} startupProbe: tcpSocket: port: tcp-web From 1e31046a305a3cd2eed91f73f142ff74ef67ab8b Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 13:26:10 -0500 Subject: [PATCH 71/78] more ram --- k8s/argoapps/apps-values/webapps.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/argoapps/apps-values/webapps.yaml b/k8s/argoapps/apps-values/webapps.yaml index f5fa1a7..7e4629c 100644 --- a/k8s/argoapps/apps-values/webapps.yaml +++ b/k8s/argoapps/apps-values/webapps.yaml @@ -26,7 +26,7 @@ apps: tag: "latest" podResources: limits: - memory: "1Gi" + memory: "8Gi" requests: cpu: 250m memory: "1Gi" From 40cae0cbcf709329262bd6c7255a3b7b04749efb Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 13:44:37 -0500 Subject: [PATCH 72/78] correct api --- k8s/argoapps/apps-values/webapps.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/argoapps/apps-values/webapps.yaml b/k8s/argoapps/apps-values/webapps.yaml index 7e4629c..8d8ed57 100644 --- a/k8s/argoapps/apps-values/webapps.yaml +++ b/k8s/argoapps/apps-values/webapps.yaml @@ -59,7 +59,7 @@ apps: liveness: "/" env: - name: OLLAMA_API_BASE_URL - value: http://ollama.apps-webapps.svc.cluster.local + value: "http://ollama.apps-webapps.svc.cluster.local:11434/api" ports: tcp: web: 8080 From 309391b0061933f456eedc284b5afa950195853b Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 14:35:28 -0500 Subject: [PATCH 73/78] more beef for llama --- k8s/argoapps/apps-values/webapps.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/k8s/argoapps/apps-values/webapps.yaml b/k8s/argoapps/apps-values/webapps.yaml index 8d8ed57..6e76366 100644 --- a/k8s/argoapps/apps-values/webapps.yaml +++ b/k8s/argoapps/apps-values/webapps.yaml @@ -26,10 +26,10 @@ apps: tag: "latest" podResources: limits: - memory: "8Gi" + memory: "16Gi" requests: - cpu: 250m - memory: "1Gi" + cpu: 1 + memory: "4Gi" ports: tcp: web: 11434 From 11de297cdfdc8a776bf059d1f76f162ef028cde7 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 14:45:25 -0500 Subject: [PATCH 74/78] added exposed ports --- k8s/apps/webapps/templates/deploy-apps.yaml | 18 ++++++++++++++++++ k8s/argoapps/apps-values/webapps.yaml | 2 ++ 2 files changed, 20 insertions(+) diff --git a/k8s/apps/webapps/templates/deploy-apps.yaml b/k8s/apps/webapps/templates/deploy-apps.yaml index ddd6447..e0e8de3 100644 --- a/k8s/apps/webapps/templates/deploy-apps.yaml +++ b/k8s/apps/webapps/templates/deploy-apps.yaml @@ -23,6 +23,24 @@ spec: protocol: UDP {{ end }} {{- end }} + +{{ if $v.exposedPorts }} +--- +kind: Service +apiVersion: v1 +metadata: + name: {{ $k }}-exposed-ports +spec: + selector: + homelab/app: scrypted + type: LoadBalancer + ports: + {{ $exPort, $inPort := range $v.exposedPorts }} + - port: "{{ $exPort }}" + targetPort: "{{ $inPort }}" + protocol: TCP + {{ end }} +{{ end }} --- apiVersion: apps/v1 kind: Deployment diff --git a/k8s/argoapps/apps-values/webapps.yaml b/k8s/argoapps/apps-values/webapps.yaml index 6e76366..0edac87 100644 --- a/k8s/argoapps/apps-values/webapps.yaml +++ b/k8s/argoapps/apps-values/webapps.yaml @@ -30,6 +30,8 @@ apps: requests: cpu: 1 memory: "4Gi" + exposedPorts: + "11434": "11434" ports: tcp: web: 11434 From 483586b3a77b76beb3d473506aedd1adba2c7be5 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 14:55:34 -0500 Subject: [PATCH 75/78] fixed ports --- k8s/apps/webapps/templates/deploy-apps.yaml | 8 ++++---- k8s/apps/webapps/values-dev.yaml | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/k8s/apps/webapps/templates/deploy-apps.yaml b/k8s/apps/webapps/templates/deploy-apps.yaml index e0e8de3..b6fcbbe 100644 --- a/k8s/apps/webapps/templates/deploy-apps.yaml +++ b/k8s/apps/webapps/templates/deploy-apps.yaml @@ -35,10 +35,10 @@ spec: homelab/app: scrypted type: LoadBalancer ports: - {{ $exPort, $inPort := range $v.exposedPorts }} - - port: "{{ $exPort }}" - targetPort: "{{ $inPort }}" - protocol: TCP + {{ range $exPort, $inPort := $v.exposedPorts }} + - port: "{{ $exPort }}" + targetPort: "{{ $inPort }}" + protocol: TCP {{ end }} {{ end }} --- diff --git a/k8s/apps/webapps/values-dev.yaml b/k8s/apps/webapps/values-dev.yaml index 329c82e..7d686b5 100644 --- a/k8s/apps/webapps/values-dev.yaml +++ b/k8s/apps/webapps/values-dev.yaml @@ -33,6 +33,8 @@ apps: health: readiness: "/" liveness: "/" + exposedPorts: + "1143": 11434 ports: tcp: web: 11434 From c16cc3363746d4b2c00d8d093c779b51b5481e68 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 14:58:31 -0500 Subject: [PATCH 76/78] using int --- k8s/apps/webapps/templates/deploy-apps.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/k8s/apps/webapps/templates/deploy-apps.yaml b/k8s/apps/webapps/templates/deploy-apps.yaml index b6fcbbe..dc331a9 100644 --- a/k8s/apps/webapps/templates/deploy-apps.yaml +++ b/k8s/apps/webapps/templates/deploy-apps.yaml @@ -36,8 +36,8 @@ spec: type: LoadBalancer ports: {{ range $exPort, $inPort := $v.exposedPorts }} - - port: "{{ $exPort }}" - targetPort: "{{ $inPort }}" + - port: {{ $exPort }} + targetPort: {{ $inPort }} protocol: TCP {{ end }} {{ end }} From 4f5c150ae1304c444cd5d50f179304d2603c8395 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 16 Feb 2024 14:59:30 -0500 Subject: [PATCH 77/78] clean up + selectors --- k8s/apps/webapps/templates/deploy-apps.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/k8s/apps/webapps/templates/deploy-apps.yaml b/k8s/apps/webapps/templates/deploy-apps.yaml index dc331a9..3bd32bb 100644 --- a/k8s/apps/webapps/templates/deploy-apps.yaml +++ b/k8s/apps/webapps/templates/deploy-apps.yaml @@ -9,7 +9,7 @@ spec: app: {{ $k }} type: ClusterIP ports: - {{ range $portName, $portValue := $v.ports.tcp }} + {{- range $portName, $portValue := $v.ports.tcp }} - port: {{ $portValue }} targetPort: {{ $portValue }} name: "{{ $portName }}" @@ -32,10 +32,10 @@ metadata: name: {{ $k }}-exposed-ports spec: selector: - homelab/app: scrypted + app: {{ $k }} type: LoadBalancer ports: - {{ range $exPort, $inPort := $v.exposedPorts }} + {{- range $exPort, $inPort := $v.exposedPorts }} - port: {{ $exPort }} targetPort: {{ $inPort }} protocol: TCP From 7626f8c986b42a5974038652edef27c7a7ceb290 Mon Sep 17 00:00:00 2001 From: Ari Date: Fri, 16 Feb 2024 16:28:26 -0500 Subject: [PATCH 78/78] clean up k3s --- os/nixos/k3s.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/os/nixos/k3s.nix b/os/nixos/k3s.nix index 1348bf2..6e86605 100644 --- a/os/nixos/k3s.nix +++ b/os/nixos/k3s.nix @@ -18,9 +18,10 @@ services.nfs.server.enable = true; services.rpcbind.enable = true; environment.systemPackages = with pkgs; [ - pkgs.k3s + k3s nfs-utils git + ]; services.k3s.enable = true; services.k3s.role = "server";