Skip to content

Commit 93410a4

Browse files
committed
fix mistakes
1 parent 15e08fb commit 93410a4

9 files changed

Lines changed: 8 additions & 28 deletions

File tree

ansible/inventory/group_vars/gatus/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ gatus_config:
5757
<<: *gatus_icmp_tcp_default
5858
- name: Home Assistant
5959
group: infra
60-
url: icmp://10.0.10.8
60+
url: icmp://10.0.20.4
6161
<<: *gatus_icmp_tcp_default
6262
- name: Kubernetes Node 1
6363
group: kubernetes

ansible/roles/traefik/files/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ http:
102102
home-assistant:
103103
loadBalancer:
104104
servers:
105-
- url: "http://10.0.10.8:8123"
105+
- url: "http://10.0.20.4:8123"
106106
synology:
107107
loadBalancer:
108108
servers:

kubernetes/apps/frigate/config.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
---
22
mqtt:
33
enabled: true
4-
host: 10.0.10.8
4+
host: 10.0.20.4
55
user: "{FRIGATE_MQTT_USER}"
66
password: "{FRIGATE_MQTT_PASSWORD}"
77

8-
# Object detection on the Intel iGPU via OpenVINO (gpu.intel.com/i915).
98
detectors:
109
ov:
1110
type: openvino
12-
device: GPU
11+
device: CPU
1312

14-
# Default SSDLite MobileNet v2 model bundled in the image.
1513
model:
1614
width: 300
1715
height: 300
@@ -20,7 +18,6 @@ model:
2018
path: /openvino-model/ssdlite_mobilenet_v2.xml
2119
labelmap_path: /openvino-model/coco_91cl_bkgr.txt
2220

23-
# Intel VAAPI hardware-accelerated decoding.
2421
ffmpeg:
2522
hwaccel_args: preset-vaapi
2623

@@ -37,7 +34,6 @@ objects:
3734

3835
record:
3936
enabled: true
40-
# 0.17 replaced record.retain with continuous/motion blocks.
4137
continuous:
4238
days: 3
4339
motion:

kubernetes/apps/frigate/helm-release.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ spec:
3535
globalMounts:
3636
- path: /config
3737
initContainers:
38-
# Copy the GitOps-managed config into the writable /config PVC.
3938
init-config:
4039
image: &image
4140
repository: ghcr.io/blakeblackshear/frigate
@@ -45,8 +44,6 @@ spec:
4544
- /bin/bash
4645
- -c
4746
- cp -f /tmp/frigate-config/config.yml /config/config.yml
48-
# Seed a writable copy of nginx's tree so the non-root user can
49-
# write runtime/log/temp files under /usr/local/nginx.
5047
init-nginx:
5148
image: *image
5249
command:
@@ -61,7 +58,6 @@ spec:
6158
name: frigate
6259
env:
6360
TZ: America/New_York
64-
# Non-root (s6-overlay) plumbing — see s6-* override scripts.
6561
HOME: /tmp/home
6662
USER: &uid "1026"
6763
S6_CATCHALL_USER: *uid
@@ -103,10 +99,6 @@ spec:
10399
memory: 4Gi
104100
defaultPodOptions:
105101
automountServiceAccountToken: false
106-
# Run as the NAS-owning user (1026:100) — matching the arr apps — so
107-
# Frigate writes recordings to NFS under standard root_squash instead
108-
# of running as root. Frigate's s6-overlay image needs the s6-* script
109-
# overrides + HOME/S6_* env + writable /run,/usr/local/nginx,/tmp/home.
110102
securityContext:
111103
runAsUser: 1026
112104
runAsGroup: &gid 100
@@ -144,7 +136,6 @@ spec:
144136
globalMounts:
145137
- path: /tmp/frigate-config
146138
readOnly: true
147-
# s6-overlay override scripts (executable) for non-root operation.
148139
s6-scripts:
149140
type: configMap
150141
name: frigate-s6-scripts
@@ -174,7 +165,6 @@ spec:
174165
sizeLimit: 512Mi
175166
globalMounts:
176167
- path: /dev/shm
177-
# Writable dirs the non-root user needs (stock image expects root here).
178168
run:
179169
type: emptyDir
180170
medium: Memory

kubernetes/apps/frigate/kustomization.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ configMapGenerator:
99
- name: frigate-configmap
1010
files:
1111
- config.yml=./config.yml
12-
# s6-overlay override scripts required to run Frigate as a non-root UID.
1312
- name: frigate-s6-scripts
1413
files:
1514
- run=./s6-log-prepare-run
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
#!/bin/bash
2-
# Non-root override for /package/admin/s6/command/s6-applyuidgid.
3-
# s6 cannot switch uid/gid without privileges when the container already
4-
# runs as a non-root user, so drop the leading uid/gid args and exec the
5-
# target program directly.
2+
# Non-root override: skip the s6 uid/gid switch, exec the target directly.
63
ARGS=( "$@" )
74
exec ${ARGS[@]:2}

kubernetes/apps/frigate/s6-log-prepare-run

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
#!/command/with-contenv bash
22
set -o errexit -o nounset -o pipefail
33

4-
# Non-root override for /etc/s6-overlay/s6-rc.d/log-prepare/run.
5-
# The stock script chowns/chmods the log dirs, which fails when Frigate
6-
# runs as a non-root UID. Just create the directories.
4+
# Non-root override: create log dirs without the stock chown/chmod.
75
dirs=(
86
/dev/shm/logs/frigate
97
/dev/shm/logs/go2rtc

kubernetes/apps/teslamateapi/helm-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
app:
4343
env:
4444
API_TOKEN_DISABLE: "false"
45-
MQTT_HOST: 10.0.10.8
45+
MQTT_HOST: 10.0.20.4
4646
TZ: America/New_York
4747
MQTT_PASSWORD:
4848
valueFrom:

kubernetes/core/proxies/hass-proxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
name: http
2424
env:
2525
- name: INT_HOST
26-
value: "http://10.0.10.8:8123"
26+
value: "http://10.0.20.4:8123"
2727
- name: EXTRA_CONFIG
2828
value: |
2929
proxy_set_header Upgrade $http_upgrade;

0 commit comments

Comments
 (0)