feat(home-assistant): migrate helmrelease to app-template v2

tyriis · Dec 8, 2023 · 9a8a1b3 · 9a8a1b3
1 parent 89133d2
commit 9a8a1b3
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 70 deletions.
diff --git a/kubernetes/talos-flux/apps/home-automation/home-assistant/app/helm-release.yaml b/kubernetes/talos-flux/apps/home-automation/home-assistant/app/helm-release.yaml
@@ -9,7 +9,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 1.5.1
+      version: 2.3.0
       interval: 15m
       sourceRef:
         kind: HelmRepository
@@ -27,23 +27,60 @@ spec:
   uninstall:
     keepHistory: false
   values:
-    image:
-      repository: ghcr.io/home-assistant/home-assistant
-      tag: 2023.12.0
-    env:
-      TZ: ${SETTING_TZ}
-    envFrom:
-      - secretRef:
-          name: home-assistant-secrets
+    controllers:
+      main:
+        annotations:
+          reloader.stakater.com/auto: "true"
+        env:
+          TZ: ${SETTING_TZ}
+        envFrom:
+          - secretRef:
+              name: home-assistant-secrets
+        containers:
+          main:
+            nameOverride: *app
+            image:
+              repository: ghcr.io/home-assistant/home-assistant
+              tag: 2023.12.0
+            ports:
+              - name: http
+                containerPort: 8123
+                protocol: TCP
+                resources:
+            probes:
+              liveness:
+                enabled: false
+              readiness:
+                enabled: false
+              startup:
+                enabled: false
+            requests:
+              cpu: 100m
+              memory: 300Mi
+            limits:
+              memory: 2048Mi
+        initContainers:
+          init-db:
+            image:
+              repository: ghcr.io/onedr0p/postgres-initdb
+              tag: 14.8@sha256:0141cf427c47f2d534711a3f9e8c5f9008bc6b585463ccd9288cf0f027e20deb
+            env:
+              TZ: ${SETTING_TZ}
+              POSTGRES_SUPER_PASS: ${SECRET_CLOUDNATIVE_PG_PASSWORD}
+            envFrom:
+              - secretRef:
+                name: home-assistant-secrets
+
     service:
       main:
         ports:
           http:
             port: 8123
+
     ingress:
       main:
         enabled: true
-        ingressClassName: traefik
+        className: traefik
         annotations:
           cert-manager.io/cluster-issuer: letsencrypt-production
           hajimari.io/enable: "true"
@@ -53,35 +90,30 @@ spec:
           - host: &host hass.${SECRET_DOMAIN}
             paths:
               - path: /
-                pathType: Prefix
+                service:
+                  name: main
+                  port: http
         tls:
           - hosts:
               - *host
             secretName: hass-cert
-    probes:
-      liveness:
-        enabled: false
-      readiness:
-        enabled: false
-      startup:
-        enabled: false
+
     persistence:
       config:
         enabled: true
-        type: pvc
         existingClaim: home-assistant-data
+        advancedMounts:
+          main:
+            main:
+              - path: /config
       ssh:
         enabled: true
         type: secret
         name: home-assistant-ssh
-        mountPath: /root/.ssh
-        readOnly: true
-        defaultMode: 0600
-    podAnnotations:
-      secret.reloader.stakater.com/reload: "home-assistant-ssh,home-assistant-secrets"
-    resources:
-      requests:
-        cpu: 100m
-        memory: 300Mi
-      limits:
-        memory: 2048Mi
+        advancedMounts:
+          main:
+            main:
+              - path: /root/.ssh
+                subPath: .ssh
+                readOnly: true
+                defaultMode: 0600
diff --git a/...netes/talos-flux/apps/home-automation/home-assistant/app/home-assistant-secrets.sops.yaml b/...netes/talos-flux/apps/home-automation/home-assistant/app/home-assistant-secrets.sops.yaml
@@ -8,7 +8,7 @@ stringData:
     #ENC[AES256_GCM,data:4nq6yvXGI7e3hGjZyhjz6yp4PWGf7ftJAP6v9VdoH7Lvj1alnMVg6B73BBM=,iv:M10pc6mN0kyTHuJu0spofMJJ1lwF/75bgZRlaAxF4u4=,tag:9FZHEB7P6lpEj8tRF/ujXA==,type:comment]
     POSTGRES_HOST: ENC[AES256_GCM,data:3QJzoUPsIwDteicPGDE7818F5nQFTtYkOV7axhXmu4WktzrIKtk=,iv:192h02fAhqGQBbMEbrTDEXXeDZ2Zn7n6kdqmqGCCeqg=,tag:b/ki1MNqSUR/LTP0xuywjA==,type:str]
     POSTGRES_USER: ENC[AES256_GCM,data:0i8Trw==,iv:4ShzkVMKOJdxcXTatWS6E+qUjFtRiSS3meDZIu11e5k=,tag:q+bdLu4wXzH/VZ2g4ChQnQ==,type:str]
-    POSTGRES_PASSWORD: ENC[AES256_GCM,data:f/7lGNin/fstqQJQD9K05ffE5vUlT7fr3gV+WUWWF3pJnv2XcaY3xLzoDQ==,iv:dlDrLOotSrBXcNV1M30On/YWvMRMxWfWlpV0qU/r1PU=,tag:Byl+ZGUYz+xWDVrS0EyW2Q==,type:str]
+    POSTGRES_PASS: ENC[AES256_GCM,data:TN05wsXN8WOMBocfuIrQTF2odq4O2fglT2jgQMpfddg7CoJwZkIQSWND4g==,iv:1ytuViM4IRPZuJdiVN6Ob6zOn01C/nxdzmVMiD0+kgc=,tag:QmT2vlNGRN0GvyyPQP7D1Q==,type:str]
     POSTGRES_DB: ENC[AES256_GCM,data:nmXBUg==,iv:IzULVYJNC18UrO+/G0dbv+bxWkGOALtia/7ZG+PEtyM=,tag:raARjEcyMEE+5/4CJ+upOw==,type:str]
     #ENC[AES256_GCM,data:jjPlHbgZM1HpaUzDCux984vtpiVnHqei6okYbDqnpCIiHSps,iv:TR47hf/Wi+Nwgh1xKPNcLidDIBBD1UEdz+M29EMcQOo=,tag:9p5BocxejyaG8mjoGmnQcQ==,type:comment]
     SECRET_RECORDER_DB_URL: ENC[AES256_GCM,data:rhhIMJAQsSAZ514wQVmcfL1Tzu1ZeNGJ96o3/QIqkPvy3xcBFVahzVd0iBU8CsMboEYxcDYBzcWVuucwaW0TY1+2PFq7YX90M2WuzSiGl9558PFOJ8BD4n/sbsNAmjP9NQWLT0vobXqL,iv:6skuyvZCwGwB7q+2wbdJBl+7ZGEU+Kw+OGOXY9Ys4mc=,tag:7cD+FgAAAyRLxELB3uk/qw==,type:str]
@@ -27,8 +27,8 @@ sops:
             eUQwcWJxQWZIUkRsb291SHpGSDhqT1EKgTQ1qSb4D0VNoXTiTkz9sHrHFPNHcPCW
             IQ8/QYEA6iWVt+v8s+ATb2OaLZhha5FgwCOGVyIv6GJLP1kBlz8RwQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2022-10-25T14:47:48Z"
-    mac: ENC[AES256_GCM,data:TZH/r/2/TnY+Ysl2nKRHEddAHLL1XAMBGSIRRHcdERLYXZ2Q5QZ3bgw91mKBmzVSM4ccMQfjHIEhNoxzYk+1GKrpMz2EuNi6rDT+fhuvIYQdA/QdI5cS0Bl1Se4DD5TdIwM8OSIE1QwVt+EREcI+xhBEtY7IWK1MSAr6REnaXcQ=,iv:AbYWECWl5PP020Y33uCWEY213nvtEW2IMQYSrfIN/jw=,tag:G/yGzbGbiddACplZDYUkug==,type:str]
+    lastmodified: "2023-12-08T14:41:53Z"
+    mac: ENC[AES256_GCM,data:HNZw61SYugWfUQdY5kk/OZTVYp4x4WXlLeqqkxWVvLsSR+5yguh4Irkj+u6tncUZtYDwtaPrSzZ8xn0b+LOGxJHGWLEjvmc7RsQ0hmNG6hlGyTCAJhzkIWBQOQzGvPW6Rloj5u7LJ0LXKoLmQwo2xKU1+eI/W/x3Mle7vJCrAh0=,iv:u4rPx4WPXszP4OC/W1WplOG6V1usTHARQcraGtYp+cc=,tag:1A1t0SSsZESI5HlaNzzw6Q==,type:str]
     pgp: []
     encrypted_regex: ^(data|stringData)$
-    version: 3.7.3
+    version: 3.8.1
diff --git a/kubernetes/talos-flux/apps/home-automation/home-assistant/app/kustomization.yaml b/kubernetes/talos-flux/apps/home-automation/home-assistant/app/kustomization.yaml
@@ -10,5 +10,3 @@ resources:
   - persistent-volume.yaml
   - persistent-volume-claim.yaml
   - helm-release.yaml
-patchesStrategicMerge:
-  - patches/db-init.yaml
diff --git a/kubernetes/talos-flux/apps/home-automation/home-assistant/app/patches/db-init.yaml b/kubernetes/talos-flux/apps/home-automation/home-assistant/app/patches/db-init.yaml