From d40204c950c4d91a638689a5aaeb670ea07f4f6f Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Fri, 24 Jan 2025 21:44:18 +0800 Subject: [PATCH] fix: rm z2m litestream, HASS app ks components --- kube/deploy/apps/home-assistant/app/hr.yaml | 37 ++++----- .../home-assistant/app/kustomization.yaml | 9 --- kube/deploy/apps/home-assistant/ks.yaml | 21 ++---- kube/deploy/apps/zigbee2mqtt/app/hr.yaml | 75 ++----------------- kube/deploy/apps/zigbee2mqtt/ks.yaml | 2 - 5 files changed, 33 insertions(+), 111 deletions(-) delete mode 100644 kube/deploy/apps/home-assistant/app/kustomization.yaml diff --git a/kube/deploy/apps/home-assistant/app/hr.yaml b/kube/deploy/apps/home-assistant/app/hr.yaml index 95302f28..90af8ed7 100644 --- a/kube/deploy/apps/home-assistant/app/hr.yaml +++ b/kube/deploy/apps/home-assistant/app/hr.yaml @@ -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 diff --git a/kube/deploy/apps/home-assistant/app/kustomization.yaml b/kube/deploy/apps/home-assistant/app/kustomization.yaml deleted file mode 100644 index e66969d0..00000000 --- a/kube/deploy/apps/home-assistant/app/kustomization.yaml +++ /dev/null @@ -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/ diff --git a/kube/deploy/apps/home-assistant/ks.yaml b/kube/deploy/apps/home-assistant/ks.yaml index 62df7a76..9c842ba0 100644 --- a/kube/deploy/apps/home-assistant/ks.yaml +++ b/kube/deploy/apps/home-assistant/ks.yaml @@ -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" diff --git a/kube/deploy/apps/zigbee2mqtt/app/hr.yaml b/kube/deploy/apps/zigbee2mqtt/app/hr.yaml index 4062c40c..e53edafb 100644 --- a/kube/deploy/apps/zigbee2mqtt/app/hr.yaml +++ b/kube/deploy/apps/zigbee2mqtt/app/hr.yaml @@ -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 diff --git a/kube/deploy/apps/zigbee2mqtt/ks.yaml b/kube/deploy/apps/zigbee2mqtt/ks.yaml index 334d078c..4a6e6b04 100644 --- a/kube/deploy/apps/zigbee2mqtt/ks.yaml +++ b/kube/deploy/apps/zigbee2mqtt/ks.yaml @@ -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"