Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(container): update ghcr.io/dragonflydb/dragonfly ( v1.22.1 → v1.22.2 ) #431

Merged
merged 2 commits into from
Sep 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
requests:
cpu: 500m
limits:
memory: 4Gi
memory: 12Gi
monitoring:
enablePodMonitor: true
backup:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: Dragonfly
metadata:
name: dragonfly
spec:
image: ghcr.io/dragonflydb/dragonfly:v1.22.1
image: ghcr.io/dragonflydb/dragonfly:v1.22.2
replicas: 3
env:
- name: MAX_MEMORY
Expand Down
46 changes: 23 additions & 23 deletions kubernetes/main/apps/database/pgadmin/app/secret.sops.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@ kind: Secret
apiVersion: v1
type: Opaque
metadata:
name: pgadmin-secret
name: pgadmin-secret
stringData:
PGADMIN_DEFAULT_EMAIL: ENC[AES256_GCM,data:cIHqcvRQnM/xSq+AdDpaTI/z7mEZ3A==,iv:R2/ZSS5Vl8I02y/xOFlADDUCq6dTyjUoEW3adZVzo8Y=,tag:IvZzFiwRzR5mmnrd+f3qMw==,type:str]
PGADMIN_DEFAULT_PASSWORD: ENC[AES256_GCM,data:xHttGGv9r9oOTJqlZaar4tuHMz5qbw1czc/Fced/kYU=,iv:tH3ZEnNMVA+F59TGd2ve0YDaCXx5AuDc0pqVyy84yIk=,tag:1GQ59uCGbP6KbHCFIg8bdg==,type:str]
config_local.py: ENC[AES256_GCM,data:m+I6G3gx9ISErrdCs+KiuVgPwEaBoEbKbDdT+H4cAUv4pN9loMrP4xLicraBNcIBWKYA/P3ja9Mvt0xRI0y4tFRQJMHdPj7FtzwDOQJ8BcReuAKHM1Glb/h7CJ4/HmcquHPzAU19kk1hkkkGtOaf6R1CmX2dLjVSH0ZNFYE1i2UQu2WwrPgxJl0aQMx+Ds/qufB4/vmttRfmWR6DGLoo0rIfhNqJb+daHBPndvjcrAZ2xcWX4zhlVcuLFeeXfjJODPM8aS03JS6jURftCv5PcCBoWUQUPQksmFc03uQjpHga8NeIQOdGw6/EfL9di/zYhjkkKyzCNKgktu87B2jEdQINIvFtcaxXbwPNPzYRLHIapD2BkHpDdv4gap8YnarXOlK+1ty9dSh0Xl+EqgvVAmliZj0sg1rQUqtHCgdfaLmC87xd/7l4ENc4EVtiBlS+5LYtQnzUtXgmvF/DNwkAqCfL1l2/jLBsPBhQwDZrfrGk2qX1CfA2rfvTZVG6m6dgMJ8wIvKpS9LTSPtLLKCg7GCUxFsNsY7BM955QOf0Z1B3PD21NZ9yfbXe8DAJnc4q9AIJD6U4opyw03c/n5CsT8YSjDdAowZesTOQdt+Ei0yyqf9IKfYVmsFk/YR6uq4weHwYLIoYzMHMr163de7uofTQ8PP6/qIUQCZcEutq8J1lPwyBlifE2c0XOjBFVvct0Rb6nde/lU55KaAyl3HiIklmkAD9a6bxu8uUquoZ0eP8hvPohRN/gqMb/XNGFNs4HGzrs4ssYhGxdll1mGPRgEFhxrlARXDLOa9m1h51fnW8XDsPnoDjVeCl56zUNc+Kbyk68UaFO2qDeZ7WYymVNsJWnedwJu+wF7Xs8FCXubKCqWO5Qa6rInf3OlZISXKUMsCNbzMyNkbu4nryVoZQCvuv+lCO5Mwr75AuvzTuo/f8rraw0dVzRdB2B2P6l9vT4Hsvyi+1xZs32fVNYf4d3kk6d5jfJOaheukQqeADQRWSduN0W6CXDqJdipzdSr/SwkdDIeDfXuh2wCpNXKg4kzez/Ma2JBEGYSyaOncMyBbJ17lOa2GRs17KaACOqMwRx6rxnWPgvLWOlCKjO714o3A=,iv:CUPlb2PS9n0d5pBSqDRd0Z0XbBOb/+sCGtYTt4VGU8Y=,tag:1gDkI5dddFeX0RKdJ96BLw==,type:str]
PGADMIN_DEFAULT_EMAIL: ENC[AES256_GCM,data:mDnkHu09PVNumYsG919F6ahM38P9Tcoi23HUm+ErxA==,iv:GKwLabXoa6rr+ON+CUTEF3y5lUQXnMcekTkQRQO27k0=,tag:zSSpV2plDrLXOhLQKYaN9g==,type:str]
PGADMIN_DEFAULT_PASSWORD: ENC[AES256_GCM,data:XNKytIwjIOW/etQvvvwoy9dGY50yXRfLbpa9fv+MCxE=,iv:ejHmuE7durqTGzTBTxWtRi5zkZYzfIwvvU9MeOeNX9s=,tag:zq/3xmJ6FlDIUDnsSzPvAg==,type:str]
config_local.py: ENC[AES256_GCM,data:DVsvzD4rY3Ddy4bCtJ2fAaHhVLEpJcRoWv+pdudYhOCFCuVFPYqDnJWBsSg9Np9bY+JBGYm5M0JNlb8rmf4JY0l57IdsDEd62bt8BQni/K9r5akBCtG1va0CNIZqYvlcVVzyJgkt1eFmOSEZq5tkQwISQ+UCZ3Sw5YQWfFjjGV9sOHP2BX1YxtVu+imiKbzBGY6IZo3uDmQNreruoII12iqA1HdMx1qgJx6JA/6ojvK/0+J56N64xWvaWFen62WuJ6/vatBifb+gX5Y2WtCgK3PY9+h4kKPSUDXwoc2LABhVhvT8kF/75yYKAMWjuNG5CS2EZGF91HtyHj3bezcMlVOPeBsr0xYpkQzo1RMWFuIYo10cqy304oGHqGCoebHGHJoTjSf8FseV7PpbfzLgRrXzCHaA4pkcN6gri9Zw5waKyF0HySgrF6UPN1Bs9im6jL/37YxCsB7XwtP4NU7tbp6bMH8Wh0n3pvnyz/NZ1Uo0+SyDKlRm32u2oBj/oEsSsrLtYKJZs0H7yRl5q7S9KjQK+k3g6VNwk0MySk3iyPmuZgt1XvXEZ4ndxKUDx/ZbDyeMqb06X1NQFqSM62TauR9rQ2bUshz9gaf6o7t/0OM7nLuNfDz2XJgRXpzKexl9d4ZP4K/2iSoN3Uo3KjFOZ52R+x3McdKuj32WsflOCm1a+cz8q/LOQwa1bm7j3EpeE6zVAeJteRg+apWcZaubnLd1mEDo9YwbfYTNH1/b6aUzzYwBQSxFo4kYp5MXLE9Bwa47vS1Taz15jtiR9dQOnq5ItGwW2Md4i8/7031ITo1MFzGnibhxHqT3fblVylWDm02Ujvhy7h8+Hz54zqhRvgeZj5Z46reJ1MjxYGWJJz8fDuHj7x7e4fqgQp1AUBgKekw6OKDb7Gg1Zyr0PkHbGrsaoxVSdGaIInKlM5xYHvdfTu0KS6Hnxfy0zi/4vrROpSly5TVfMg5okGHapBnfbbeVE8XGSYAE36dPEI1xfCiY7QDSeS/db7rZ0dclZf+JPTNSOszQMSu0GNqfyCIP5usbeRSkGSEIpGghzTH4FbQIltNQgSOu5hktsR9BacQruHs0Yc7r5xO/bJJTxDeAy6w=,iv:ItRTz5HZ6y8Shh0LkZ1NQH7pJjtR8PE0sUCjJznPYEs=,tag:p3mH5DDdHciQ1D8ngUkMfw==,type:str]
sops:
kms: []
gcp_kms: []
azure_kv: []
hc_vault: []
age:
- recipient: age148wprsnqjq8jughvywnzmvs8gffhrkendpr7g60q8u4rdsj4jvuqk7ltrs
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3czcza25WVHdQSjVsNDhF
QWRtN2N2WU05cEpnZ045Mjh5bDlHbUM5NjFrClQ2WlVtbkVzOGRTRytvT3JzODVF
SnBCNTJnRkZzRlBzcElDMUI5UDJQZE0KLS0tIHNxdWoxMFZTRWNpQ2RNM01JdjY0
UXNFM0J2REw0ZzJhRC9QakxUWnZCUnMKpEjTWQ3kUT2oI5qmHaAsxcPyJiXsZMbJ
1oRDKCDg7dHUpwg64Ryazzaj8y93R78eHdhuCXesAq/Ehm9Dd0FaiQ==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-06-13T19:33:59Z"
mac: ENC[AES256_GCM,data:cdretLXTb5hU5bl4TxsLg0Ow482ednZzN7oZvsD5GZzhEtneE31r3qu8GnqJ6t/3zotrHbgWmu0UYk/YYuMNS/nQWejsCGMDWZmPHHyI+a2TqpVib/dufXk8BKYv+Mropgp2rwHRPyH1E7Drz7KwHGYgiQWIZOkC99zrGggKXhM=,iv:BFEThJNL8s5rNVPwTYVOBLRkJ8qV8JD5lhFQwXyOOMA=,tag:IKjdWG9idy3ADm678lYtgQ==,type:str]
pgp: []
encrypted_regex: ^(data|stringData)$
version: 3.8.1
kms: []
gcp_kms: []
azure_kv: []
hc_vault: []
age:
- recipient: age148wprsnqjq8jughvywnzmvs8gffhrkendpr7g60q8u4rdsj4jvuqk7ltrs
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlMnczNjF6eXF6UjJGY2Vx
Q0hFWFRoSG1oQnI4a3lLWkE1ZVBQc2ErbUJZCjByR3dHcStWMi9ta3NxNkRNUVhz
Q3hHbk00R2NmcmhPN29NYkxjblFPakUKLS0tIGZUczhoVHhmK0tUWlAvMXNVUFBJ
SUZlcVB5eVVOV01VNk5XSW1WY1hYeDQKbvVi8l0vQDcXBOU57l4D5hl1dyKW6Auz
KMkzore6ab3RRvnhl/plBumKuBgUGLYBWbvCB9W5Am0/0wEgPnmtbg==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-09-21T05:41:18Z"
mac: ENC[AES256_GCM,data:xrrtp+k1bg8FVl8Ghk50FcSkOIhqvctwolckgIZR2wqyjrlBJCT5Y+PK7jj7bwl+biHKsPwKLCFZQYTG3zWX/nRE3ltYt8JDKMiaBFS70CmEP8WZskH2bJyTyOLZLq2iVceZdyIoMSo3jk1SfLvEmwkWF9E8ejtWBQ5kXJRu93E=,iv:51Q7L+OALG+f+ZLU8S5SDbL6bcD32TTQdfK+VtCeOiY=,tag:InsrYZbIy8vmJdu7nWz5ew==,type:str]
pgp: []
encrypted_regex: ^(data|stringData)$
version: 3.9.0
1 change: 1 addition & 0 deletions kubernetes/main/apps/default/kopia/app/helmrelease.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# First, create the repository from the CLI or desktop GUI.
---
# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2.schema.json
apiVersion: helm.toolkit.fluxcd.io/v2
Expand Down
113 changes: 65 additions & 48 deletions kubernetes/main/apps/home/frigate/app/resources/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
version: 0.14
mqtt:
host: emqx-listeners.database.svc.cluster.local
host: mosquitto.home.svc.cluster.local
topic_prefix: frigate
port: 1883
user: "{FRIGATE_MQTT_USERNAME}"
Expand Down Expand Up @@ -41,102 +42,110 @@ snapshots:

go2rtc:
streams:
nursery_sub:
- rtsp://{FRIGATE_RTSP_USER}:{FRIGATE_RTSP_PASSWORD}@10.1.4.31:554/cam/realmonitor?channel=1&subtype=1&authbasic=64
nursery:
- rtsp://{FRIGATE_RTSP_USER}:{FRIGATE_RTSP_PASSWORD}@10.1.4.31:554/cam/realmonitor?channel=1&subtype=0&authbasic=64
entry:
- rtsp://{FRIGATE_RTSP_USER}:{FRIGATE_RTSP_PASSWORD}@10.1.4.34:554/cam/realmonitor?channel=1&subtype=0&authbasic=64
- rtsp://admin:{FRIGATE_RTSP_PASSWORD}@10.1.4.31:554/cam/realmonitor?channel=1&subtype=0&authbasic=64
nursery_sub:
- rtsp://admin:{FRIGATE_RTSP_PASSWORD}@10.1.4.31:554/cam/realmonitor?channel=1&subtype=1&authbasic=64
baby:
- rtsp://admin:{FRIGATE_RTSP_PASSWORD}@10.1.4.34:554/cam/realmonitor?channel=1&subtype=0&authbasic=64
baby_sub:
- rtsp://admin:{FRIGATE_RTSP_PASSWORD}@10.1.4.34:554/cam/realmonitor?channel=1&subtype=1&authbasic=64
playroom:
- rtsp://{FRIGATE_RTSP_USER}:{FRIGATE_RTSP_PASSWORD}@10.1.4.35:554/cam/realmonitor?channel=1&subtype=0&authbasic=64
#office_sub:
#- rtsp://{FRIGATE_RTSP_USER}:{FRIGATE_RTSP_PASSWORD}@10.1.4.32:554/cam/realmonitor?channel=1&subtype=1&authbasic=64
- rtsp://admin:{FRIGATE_RTSP_PASSWORD}@10.1.4.35:554/cam/realmonitor?channel=1&subtype=0&authbasic=64
playroom_sub:
- rtsp://admin:{FRIGATE_RTSP_PASSWORD}@10.1.4.35:554/cam/realmonitor?channel=1&subtype=1&authbasic=64
office:
- rtsp://{FRIGATE_RTSP_USER}:{FRIGATE_RTSP_PASSWORD}@10.1.4.32:554/cam/realmonitor?channel=1&subtype=0&authbasic=64
#- ffmpeg:office#
- rtsp://admin:{FRIGATE_RTSP_PASSWORD}@10.1.4.32:554/cam/realmonitor?channel=1&subtype=0&authbasic=64
office_sub:
- rtsp://admin:{FRIGATE_RTSP_PASSWORD}@10.1.4.32:554/cam/realmonitor?channel=1&subtype=1&authbasic=64
garage:
- rtsp://{FRIGATE_RTSP_USER}:{FRIGATE_RTSP_PASSWORD}@10.1.4.30:554/cam/realmonitor?channel=1&subtype=0&authbasic=64
- rtsp://admin:{FRIGATE_RTSP_PASSWORD}@10.1.4.30:554/cam/realmonitor?channel=1&subtype=0&authbasic=64
garage_sub:
- rtsp://admin:{FRIGATE_RTSP_PASSWORD}@10.1.4.30:554/cam/realmonitor?channel=1&subtype=1&authbasic=64
front_door:
- rtsp://{FRIGATE_RTSP_USER}:{FRIGATE_RTSP_PASSWORD}@10.1.4.10:554/cam/realmonitor?channel=1&subtype=0&authbasic=64
- rtsp://admin:{FRIGATE_RTSP_PASSWORD}@10.1.4.10:554/cam/realmonitor?channel=1&subtype=0&authbasic=64#backchannel=0
utility:
- rtsp://{FRIGATE_RTSP_USER}:{FRIGATE_RTSP_PASSWORD}@10.1.4.33:554/cam/realmonitor?channel=1&subtype=0&authbasic=64
- rtsp://admin:{FRIGATE_RTSP_PASSWORD}@10.1.4.33:554/cam/realmonitor?channel=1&subtype=0&authbasic=64
utility_sub:
- rtsp://admin:{FRIGATE_RTSP_PASSWORD}@10.1.4.33:554/cam/realmonitor?channel=1&subtype=1&authbasic=64
webrtc:
candidates:
- 10.1.2.11:8555
- "{LB_GO2RTC_WEBRTC}:8555"
- stun:8555

cameras:
nursery:
ffmpeg:
inputs:
- path: rtsp://127.0.0.1:8554/nursery
input_args: preset-rtsp-restream
roles:
- record
- path: rtsp://127.0.0.1:8554/nursery_sub
input_args: preset-rtsp-restream
roles:
- audio
- detect
- record
output_args:
#record: -f segment -segment_time 10 -segment_format mp4 -reset_timestamps 1 -strftime 1 -c:v copy -c:a aac
record: preset-record-generic-audio-copy
live:
stream_name: nursery
detect:
width: 1280
height: 720
width: 640
height: 480
fps: 10
onvif:
host: 10.1.4.31
port: 80
user: '{FRIGATE_RTSP_USER}'
password: '{FRIGATE_RTSP_PASSWORD}'

entry:
baby:
ffmpeg:
inputs:
- path: rtsp://127.0.0.1:8554/entry
- path: rtsp://127.0.0.1:8554/baby
input_args: preset-rtsp-restream
roles:
- record
- path: rtsp://127.0.0.1:8554/baby_sub
input_args: preset-rtsp-restream
roles:
- audio
- detect
- record
output_args:
record: preset-record-generic-audio-copy
live:
stream_name: entry
audio:
enabled: true
listen:
- fire_alarm
stream_name: baby
detect:
width: 2560
height: 1440
width: 640
height: 480
fps: 10
onvif:
host: 10.1.4.34
port: 80
#user: '{FRIGATE_RTSP_USER}'
#password: '{FRIGATE_RTSP_PASSWORD}'
user: '{FRIGATE_RTSP_USER}'
password: '{FRIGATE_RTSP_PASSWORD}'

office:
ffmpeg:
inputs:
#- path: rtsp://127.0.0.1:8554/office_sub
#input_args: preset-rtsp-restream
#roles:
#- audio
#- detect
- path: rtsp://127.0.0.1:8554/office
input_args: preset-rtsp-restream
roles:
- record
- path: rtsp://127.0.0.1:8554/office_sub
input_args: preset-rtsp-restream
roles:
- audio
- detect
- record
output_args:
record: preset-record-generic-audio-copy
live:
stream_name: office
detect:
width: 1920
height: 1080
width: 640
height: 480
fps: 10
onvif:
host: 10.1.4.32
port: 80
Expand All @@ -147,11 +156,14 @@ cameras:
ffmpeg:
inputs:
- path: rtsp://127.0.0.1:8554/playroom
input_args: preset-rtsp-restream
roles:
- record
- path: rtsp://127.0.0.1:8554/playroom_sub
input_args: preset-rtsp-restream
roles:
- audio
- detect
- record
output_args:
record: preset-record-generic-audio-copy
live:
Expand All @@ -161,8 +173,9 @@ cameras:
listen:
- fire_alarm
detect:
width: 2560
height: 1440
width: 640
height: 480
fps: 10
onvif:
host: 10.1.4.35
port: 80
Expand All @@ -184,9 +197,9 @@ cameras:
audio:
enabled: false
detect:
width: 1280
height: 720
fps: 5
width: 640
height: 480
fps: 10
onvif:
host: 10.1.4.30
port: 80
Expand All @@ -197,11 +210,14 @@ cameras:
ffmpeg:
inputs:
- path: rtsp://127.0.0.1:8554/utility
input_args: preset-rtsp-restream
roles:
- record
- path: rtsp://127.0.0.1:8554/utility_sub
input_args: preset-rtsp-restream
roles:
- audio
- detect
- record
output_args:
record: preset-record-generic-audio-copy
live:
Expand All @@ -216,8 +232,9 @@ cameras:
- sink
- tapping
detect:
width: 1280
height: 720
width: 640
height: 480
fps: 10

front_door:
ffmpeg:
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/main/apps/home/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ kind: Kustomization
resources:
- ./namespace.yaml
- ./esphome/ks.yaml
# - ./frigate/ks.yaml
- ./frigate/ks.yaml
# - ./home-assistant/ks.yaml
- ./mosquitto/ks.yaml
32 changes: 25 additions & 7 deletions kubernetes/main/apps/home/mosquitto/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,23 @@ spec:
controllers:
mosquitto:
strategy: RollingUpdate
annotations:
reloader.stakater.com/auto: "true"
initContainers:
init-config:
image:
repository: &image docker.io/library/eclipse-mosquitto
tag: &tag 2.0.18@sha256:d12c8f80dfc65b768bb9acecc7ef182b976f71fb681640b66358e5e0cf94e9e9
command: ["/bin/sh", "-c"]
args: >-
cp /tmp/passwd /mosquitto/external_config/passwd &&
chmod 0700 /mosquitto/external_config/passwd
# mosquitto_passwd -U /mosquitto/external_config/passwd
containers:
app:
image:
repository: docker.io/library/eclipse-mosquitto
tag: 2.0.18@sha256:d12c8f80dfc65b768bb9acecc7ef182b976f71fb681640b66358e5e0cf94e9e9
repository: *image
tag: *tag
probes:
liveness:
enabled: true
Expand All @@ -48,8 +60,10 @@ spec:
defaultPodOptions:
securityContext:
runAsNonRoot: true
runAsUser: 65534
runAsGroup: 65534
runAsUser: 568
runAsGroup: 568
fsGroup: 568
fsGroupChangePolicy: OnRootMismatch
seccompProfile: { type: RuntimeDefault }
service:
app:
Expand All @@ -74,14 +88,18 @@ spec:
- path: /mosquitto/config/mosquitto.conf
subPath: mosquitto.conf
readOnly: true
logs:
type: emptyDir
globalMounts:
- path: /mosquitto/log
passwd:
type: secret
name: mosquitto-secret
globalMounts:
- path: /mosquitto/config/passwd
- path: /tmp/passwd
subPath: passwd
readOnly: true
logs:
external-config:
type: emptyDir
globalMounts:
- path: /mosquitto/log
- path: /mosquitto/external_config
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ listener 1883
allow_anonymous false
persistence true
persistence_location /mosquitto/data
password_file /mosquitto/config/passwd
password_file /mosquitto/external_config/passwd
protocol mqtt
3 changes: 2 additions & 1 deletion kubernetes/main/flux/vars/cluster-settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ data:
LB_MQTT_ADDR: 10.1.2.127
LB_PLEX_ADDR: 10.1.2.128
LB_IVENTOY_ADDR: 10.1.2.129
LB_SSH_SERVER_ADDR: 10.1.2.140
LB_SSH_SERVER_ADDR: 10.1.2.130
LB_GO2RTC_WEBRTC: 10.1.2.131

NFS_SERVER_ADDR: 10.1.2.10
NFS_SERVER_BACKUP_DIR: /backup
Expand Down
Loading
Loading