github-personal/Biohazard
1
0
Fork 0
mirror of https://github.com/outbackdingo/Biohazard.git synced 2026-01-27 18:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: rm z2m litestream, HASS app ks components

Browse Source
This commit is contained in:
JJGadgets
2025-01-24 21:44:18 +08:00
parent be53dd6b15
commit d40204c950
5 changed files with 33 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
kube/deploy/apps/home-assistant/app/hr.yaml
View File

@@ -1,6 +1,6 @@
---
# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/app-template-3.6.0/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
apiVersion: helm.toolkit.fluxcd.io/v2beta2
# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/app-template-3.6.1/charts/other/app-template/schemas/helmrelease-helm-v2.schema.json
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: &app home-assistant
@@ -10,7 +10,7 @@ spec:
chart:
spec:
chart: app-template
version: "3.6.0"
version: "3.6.1"
sourceRef:
name: bjw-s
kind: HelmRepository
@@ -57,12 +57,6 @@ spec:
allowPrivilegeEscalation: false
capabilities:
drop: ["ALL"]
resources:
requests:
cpu: "10m"
limits:
cpu: "1"
memory: "1Gi"
probes:
liveness:
enabled: true
@@ -91,13 +85,6 @@ spec:
name: "home-assistant-secrets"
key: "AGE_SECRET"
securityContext: *sc
resources:
requests:
cpu: 10m
memory: 128Mi
limits:
cpu: "1"
memory: 1024Mi
initContainers:
01-litestream-restore:
<<: *ls
@@ -235,7 +222,7 @@ spec:
defaultPodOptions:
automountServiceAccountToken: false
enableServiceLinks: false
# hostUsers: false # CephFS support needed
hostUsers: false
securityContext:
runAsNonRoot: true
runAsUser: 65534
@@ -250,3 +237,19 @@ spec:
- matchExpressions:
- key: "fuckoff.home.arpa/home-assistant"
operator: "DoesNotExist"
postRenderers:
- kustomize:
patches:
- target:
kind: Deployment
name: home-assistant
patch: |
spec:
template:
spec:
resources:
requests:
cpu: 30m
limits:
cpu: 1
memory: 1Gi

9
kube/deploy/apps/home-assistant/app/kustomization.yaml
View File

@@ -1,9 +0,0 @@
---
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ./hr.yaml
- ./es.yaml
- ./multus.yaml
- ./netpol.yaml
- ../../../core/db/litestream/template/

21
kube/deploy/apps/home-assistant/ks.yaml
View File

@@ -9,25 +9,13 @@ metadata:
spec:
commonMetadata:
labels: *l
targetNamespace: "home-assistant"
path: ./kube/deploy/apps/home-assistant/app
targetNamespace: "home-assistant"
components:
- ../../../core/db/litestream/template/
- ../../../core/storage/volsync/component/
dependsOn:
- name: home-assistant-pvc
- name: 1-core-1-networking-multus-app
---
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: home-assistant-pvc
namespace: flux-system
labels: &l
app.kubernetes.io/name: "home-assistant"
spec:
commonMetadata:
labels: *l
path: ./kube/deploy/core/storage/volsync/template
targetNamespace: "home-assistant"
dependsOn:
- name: 1-core-storage-volsync-app
- name: 1-core-storage-rook-ceph-cluster
postBuild:
@@ -41,3 +29,4 @@ spec:
RUID: "65534"
RGID: &gid "65533"
RFSG: *gid
LS_AGE_ES: "Home Assistant"

75
kube/deploy/apps/zigbee2mqtt/app/hr.yaml
View File

@@ -1,5 +1,5 @@
---
# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/common-3.6.0/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/app-template-3.6.1/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
apiVersion: helm.toolkit.fluxcd.io/v2beta2
kind: HelmRelease
metadata:
@@ -10,7 +10,7 @@ spec:
chart:
spec:
chart: app-template
version: 3.6.0
version: 3.6.1
sourceRef:
name: bjw-s
kind: HelmRepository
@@ -65,11 +65,12 @@ spec:
capabilities:
drop: ["ALL"]
add: ["NET_BIND_SERVICE"]
# resources:
# requests:
# cpu: "10m"
# limits:
# memory: "256Mi"
resources:
requests:
cpu: "10m"
limits:
cpu: "1"
memory: "256Mi"
probes:
liveness:
enabled: true
@@ -81,34 +82,6 @@ spec:
failureThreshold: 300
periodSeconds: 1
initialDelaySeconds: 10
litestream: &ls
image:
repository: "docker.io/litestream/litestream"
tag: "0.3.13@sha256:027eda2a89a86015b9797d2129d4dd447e8953097b4190e1d5a30b73e76d8d58"
args: ["replicate"]
envFrom:
- secretRef:
name: litestream-secrets
env: &lsenv
DB_PATH: "/config/database.db"
REMOTE_PATH: "zigbee2mqtt/database"
VALIDATION_INTERVAL: "24h"
AGE_PUBKEY:
valueFrom:
secretKeyRef:
name: "litestream-agekey"
key: "AGE_PUBKEY"
AGE_SECRET:
valueFrom:
secretKeyRef:
name: "litestream-agekey"
key: "AGE_SECRET"
securityContext: *sc
initContainers:
01-litestream-restore:
<<: *ls
args: ["restore", "-if-db-not-exists", "-if-replica-exists", "/config/database.db"]
env: *lsenv
service:
zigbee2mqtt:
controller: zigbee2mqtt
@@ -145,16 +118,6 @@ spec:
globalMounts:
- subPath: configlog
path: /config/log
litestream:
type: secret
name: "litestream-secrets"
advancedMounts:
zigbee2mqtt:
litestream: &lsmnt
- subPath: "litestream.yml"
path: "/etc/litestream.yml"
readOnly: true
01-litestream-restore: *lsmnt
defaultPodOptions:
automountServiceAccountToken: false
enableServiceLinks: false
@@ -170,13 +133,6 @@ spec:
fsGroup: *uid
fsGroupChangePolicy: Always
seccompProfile: { type: "RuntimeDefault" }
topologySpreadConstraints:
- maxSkew: 1
topologyKey: kubernetes.io/hostname
whenUnsatisfiable: DoNotSchedule
labelSelector:
matchLabels:
app.kubernetes.io/name: *app
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
@@ -184,18 +140,3 @@ spec:
- matchExpressions:
- key: fuckoff.home.arpa/zigbee2mqtt
operator: DoesNotExist
postRenderers:
- kustomize:
patches:
- target:
kind: Deployment
name: zigbee2mqtt
patch: |
- op: add
path: "/spec/template/spec/resources"
value:
requests:
cpu: 30m
limits:
cpu: 1
memory: 256Mi

2
kube/deploy/apps/zigbee2mqtt/ks.yaml
View File

@@ -12,7 +12,6 @@ spec:
targetNamespace: "zigbee2mqtt"
path: ./kube/deploy/apps/zigbee2mqtt/app
components:
- ../../../core/db/litestream/template/
- ../../../core/storage/volsync/component/
dependsOn:
- name: 1-core-storage-volsync-app
@@ -29,4 +28,3 @@ spec:
RUID: &uid "1000"
RGID: *uid
RFSG: *uid
LS_AGE_ES: "zigbee2mqtt"