From d1f9f7ba788c495479fa1e91f200de76e342a368 Mon Sep 17 00:00:00 2001 From: auricom <27022259+auricom@users.noreply.github.com> Date: Tue, 26 Mar 2024 01:12:59 +0100 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20app-template=20(?= =?UTF-8?q?=202.6.0=20=E2=86=92=203.0.4=20)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/default/atuin/app/helmrelease.yaml | 25 ++++++++++-------- .../default/authelia/app/helmrelease.yaml | 20 +++++++------- .../default/babybuddy/app/helmrelease.yaml | 23 ++++++++-------- .../apps/default/bazarr/app/helmrelease.yaml | 20 +++++++------- .../apps/default/calibre/app/helmrelease.yaml | 18 +++++++------ .../apps/default/flood/app/helmrelease.yaml | 24 +++++++++-------- .../default/freshrss/app/helmrelease.yaml | 21 ++++++++------- .../apps/default/frigate/app/helmrelease.yaml | 23 ++++++++-------- .../default/ghostfolio/app/helmrelease.yaml | 18 +++++++------ .../home-assistant/app/helmrelease.yaml | 18 +++++++------ .../home-assistant/code/helmrelease.yaml | 26 ++++++++++--------- 11 files changed, 127 insertions(+), 109 deletions(-) diff --git a/kubernetes/apps/default/atuin/app/helmrelease.yaml b/kubernetes/apps/default/atuin/app/helmrelease.yaml index 1d69f2f29..3c97d7248 100644 --- a/kubernetes/apps/default/atuin/app/helmrelease.yaml +++ b/kubernetes/apps/default/atuin/app/helmrelease.yaml @@ -1,15 +1,15 @@ --- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: - name: atuin + name: &app atuin spec: interval: 30m chart: spec: chart: app-template - version: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s @@ -20,12 +20,13 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false values: controllers: - main: + atuin: replicas: 2 strategy: RollingUpdate annotations: @@ -39,7 +40,7 @@ spec: - secretRef: name: atuin-secret containers: - main: + app: image: repository: ghcr.io/atuinsh/atuin tag: v18.1.0@sha256:c1245d9bbaf9ef1610a973750003d634d55e52ffb3e14caa9bb47c867e1f6c6e @@ -52,11 +53,11 @@ spec: ATUIN_METRICS__PORT: &metricsPort 8080 ATUIN_TLS__ENABLE: "false" envFrom: *envFrom - args: ["server", "start"] + args: [server, start] securityContext: allowPrivilegeEscalation: false readOnlyRootFilesystem: true - capabilities: { drop: ["ALL"] } + capabilities: { drop: [ALL] } resources: requests: cpu: 10m @@ -70,14 +71,16 @@ spec: fsGroup: 568 fsGroupChangePolicy: OnRootMismatch service: - main: + app: + controller: *app ports: http: port: *port metrics: port: *metricsPort serviceMonitor: - main: + app: + serviceName: *app enabled: true endpoints: - port: metrics @@ -88,7 +91,7 @@ spec: ingress: main: enabled: true - className: "nginx" + className: nginx annotations: hajimari.io/icon: mdi:powershell hosts: @@ -96,7 +99,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/default/authelia/app/helmrelease.yaml b/kubernetes/apps/default/authelia/app/helmrelease.yaml index ffdb53f37..c49e8a9d5 100644 --- a/kubernetes/apps/default/authelia/app/helmrelease.yaml +++ b/kubernetes/apps/default/authelia/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/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: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s @@ -23,6 +23,7 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false @@ -45,14 +46,13 @@ spec: matchLabels: app.kubernetes.io/name: *app controllers: - main: + authelia: replicas: 2 strategy: RollingUpdate annotations: reloader.stakater.com/auto: "true" initContainers: init-db: - order: 1 image: repository: ghcr.io/onedr0p/postgres-init tag: 16 @@ -60,7 +60,7 @@ spec: - secretRef: name: authelia-secret containers: - main: + app: image: repository: ghcr.io/authelia/authelia tag: v4.38.0-beta3@sha256:b48ae4d0ed9d1eee76efe382df60928bae550ec19e5663858dde6dc5f41cf285 @@ -101,7 +101,7 @@ spec: AUTHELIA_TOTP_ISSUER: authelia.com AUTHELIA_WEBAUTHN_DISABLE: "true" envFrom: *envFrom - args: ["--config", "/config/configuration.yaml", "--config.experimental.filters", "expand-env"] + args: [--config, /config/configuration.yaml, --config.experimental.filters, expand-env] probes: liveness: &probes enabled: true @@ -124,14 +124,16 @@ spec: limits: memory: 128Mi service: - main: + app: + controller: *app ports: http: port: *port metrics: port: 8080 serviceMonitor: - main: + app: + serviceName: *app enabled: true endpoints: - port: metrics @@ -157,7 +159,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/default/babybuddy/app/helmrelease.yaml b/kubernetes/apps/default/babybuddy/app/helmrelease.yaml index 3ff80e545..2f51e9673 100644 --- a/kubernetes/apps/default/babybuddy/app/helmrelease.yaml +++ b/kubernetes/apps/default/babybuddy/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/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: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s @@ -23,17 +23,17 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false values: controllers: - main: + babybuddy: annotations: reloader.stakater.com/auto: "true" initContainers: init-db: - order: 1 image: repository: ghcr.io/onedr0p/postgres-init tag: 16 @@ -41,15 +41,14 @@ spec: - secretRef: name: babybuddy-secret migrations: - order: 2 image: repository: ghcr.io/auricom/babybuddy tag: 2.2.1@sha256:e7bbb30bff8c1023c566ad58455cffcb5cca91f2d9479040c3e5a90c27656bfd pullPolicy: IfNotPresent envFrom: *envFrom command: - - "/bin/bash" - - "-c" + - /bin/bash + - -c - | #!/bin/bash @@ -60,7 +59,7 @@ spec: python3 ./manage.py migrate --noinput python3 ./manage.py createcachetable containers: - main: + app: image: repository: ghcr.io/auricom/babybuddy tag: 2.2.1@sha256:e7bbb30bff8c1023c566ad58455cffcb5cca91f2d9479040c3e5a90c27656bfd @@ -75,14 +74,15 @@ spec: cpu: 100m memory: 256Mi service: - main: + app: + controller: *app ports: http: port: 3000 ingress: main: enabled: true - className: "nginx" + className: nginx annotations: hajimari.io/icon: mdi:baby-face-outline hosts: @@ -91,7 +91,8 @@ spec: - path: / pathType: Prefix service: - name: main + identifier: app + port: http tls: - hosts: - *host diff --git a/kubernetes/apps/default/bazarr/app/helmrelease.yaml b/kubernetes/apps/default/bazarr/app/helmrelease.yaml index 69d0b6e43..bc6e96c42 100644 --- a/kubernetes/apps/default/bazarr/app/helmrelease.yaml +++ b/kubernetes/apps/default/bazarr/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/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: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s @@ -23,6 +23,7 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false @@ -39,12 +40,11 @@ spec: fsGroup: 568 fsGroupChangePolicy: OnRootMismatch controllers: - main: + bazarr: annotations: reloader.stakater.com/auto: "true" initContainers: init-db: - order: 1 image: repository: ghcr.io/onedr0p/postgres-init tag: 16 @@ -52,7 +52,7 @@ spec: - secretRef: name: bazarr-secret containers: - main: + app: image: repository: ghcr.io/onedr0p/bazarr tag: 1.4.2@sha256:113035f37f289f190781d9d728f2ebf56c895b972921820f5d30408427c837d9 @@ -76,14 +76,15 @@ spec: - --wait=86400 # 1 day - --root=/add-ons service: - main: + app: + controller: *app ports: http: port: 6767 ingress: main: enabled: true - className: "nginx" + className: nginx annotations: nginx.ingress.kubernetes.io/auth-method: GET nginx.ingress.kubernetes.io/auth-url: http://authelia.default.svc.cluster.local.:8888/api/verify @@ -96,7 +97,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: @@ -115,7 +116,7 @@ spec: video: enabled: true type: nfs - server: "192.168.9.10" + server: ${LOCAL_LAN_TRUENAS} path: /mnt/storage/video globalMounts: - path: /mnt/storage/video @@ -124,6 +125,5 @@ spec: type: configMap name: bazarr-scripts # overriden by kustomizeconfig defaultMode: 0775 - readOnly: true globalMounts: - path: /scripts diff --git a/kubernetes/apps/default/calibre/app/helmrelease.yaml b/kubernetes/apps/default/calibre/app/helmrelease.yaml index 5c9104645..a0643c753 100644 --- a/kubernetes/apps/default/calibre/app/helmrelease.yaml +++ b/kubernetes/apps/default/calibre/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/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: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s @@ -23,14 +23,15 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false values: controllers: - main: + calibre: containers: - main: + app: image: repository: ghcr.io/linuxserver/calibre tag: version-v7.7.0@sha256:c97ee9212dbf30f3ced25eae5fea63d92890134695c5da977b7f19b377b64043 @@ -45,14 +46,15 @@ spec: limits: memory: 604M service: - main: + app: + controller: *app ports: http: port: 8080 ingress: main: enabled: true - className: "nginx" + className: nginx annotations: nginx.ingress.kubernetes.io/auth-method: GET nginx.ingress.kubernetes.io/auth-url: http://authelia.default.svc.cluster.local.:8888/api/verify @@ -65,7 +67,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: @@ -79,7 +81,7 @@ spec: books: enabled: true type: nfs - server: "192.168.9.10" + server: ${LOCAL_LAN_TRUENAS} path: /mnt/storage/home/claude/books globalMounts: - path: /mnt/storage/home/claude/books diff --git a/kubernetes/apps/default/flood/app/helmrelease.yaml b/kubernetes/apps/default/flood/app/helmrelease.yaml index 730a789e6..a71b4b830 100644 --- a/kubernetes/apps/default/flood/app/helmrelease.yaml +++ b/kubernetes/apps/default/flood/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/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: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s @@ -23,6 +23,7 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false @@ -32,20 +33,20 @@ spec: runAsUser: 1001 runAsGroup: 1001 fsGroup: 1001 - fsGroupChangePolicy: "OnRootMismatch" + fsGroupChangePolicy: OnRootMismatch controllers: - main: + flood: annotations: reloader.stakater.com/auto: "true" containers: - main: + app: image: repository: jesec/flood tag: master@sha256:67203d2838eed158b469ed2a66edfe28df90eb530e2649852d575aedf00c7821 env: FLOOD_OPTION_RUNDIR: /data - FLOOD_OPTION_AUTH: "none" - FLOOD_OPTION_QBURL: "http://qbittorrent.default.svc.cluster.local.:8080" + FLOOD_OPTION_AUTH: none + FLOOD_OPTION_QBURL: http://qbittorrent.default.svc.cluster.local.:8080 envFrom: - secretRef: name: flood-secret @@ -56,14 +57,15 @@ spec: limits: memory: 512Mi service: - main: + app: + controller: *app ports: http: port: 3000 ingress: - main: + app: enabled: true - className: "nginx" + className: nginx annotations: nginx.ingress.kubernetes.io/auth-method: GET nginx.ingress.kubernetes.io/auth-url: http://authelia.default.svc.cluster.local.:8888/api/verify @@ -76,7 +78,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/default/freshrss/app/helmrelease.yaml b/kubernetes/apps/default/freshrss/app/helmrelease.yaml index 5f9f36001..0e0d3e491 100644 --- a/kubernetes/apps/default/freshrss/app/helmrelease.yaml +++ b/kubernetes/apps/default/freshrss/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/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: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s @@ -23,17 +23,17 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false values: controllers: - main: + freshrss: annotations: reloader.stakater.com/auto: "true" initContainers: init-db: - order: 1 image: repository: ghcr.io/onedr0p/postgres-init tag: 16 @@ -41,27 +41,28 @@ spec: - secretRef: name: freshrss-secret containers: - main: + app: image: repository: freshrss/freshrss tag: 1.23.1@sha256:c554223f485843553f7b7c9faff1f5c6c6113ce15b0288dd07210e97d8bbbbcc env: TZ: ${TIMEZONE} - CRON_MIN: "18,48" + CRON_MIN: 18,48 DOMAIN: "https://freshrss.${SECRET_CLUSTER_DOMAIN}/" resources: requests: cpu: 50m memory: 256Mi service: - main: + app: + controller: *app ports: http: port: 80 ingress: - main: + app: enabled: true - className: "nginx" + className: nginx annotations: hajimari.io/icon: mdi:rss hosts: @@ -69,7 +70,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/default/frigate/app/helmrelease.yaml b/kubernetes/apps/default/frigate/app/helmrelease.yaml index ae1c3adae..c657d9e02 100644 --- a/kubernetes/apps/default/frigate/app/helmrelease.yaml +++ b/kubernetes/apps/default/frigate/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/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: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s @@ -22,6 +22,7 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false @@ -40,11 +41,11 @@ spec: google.feature.node.kubernetes.io/coral: "true" intel.feature.node.kubernetes.io/gpu: "true" controllers: - main: + frigate: annotations: reloader.stakater.com/auto: "true" containers: - main: + app: image: repository: ghcr.io/blakeblackshear/frigate tag: 0.13.2@sha256:2906991ccad85035b176941f9dedfd35088ff710c39d45ef1baa9a49f2b16734 @@ -80,7 +81,8 @@ spec: securityContext: privileged: true service: - main: + app: + controller: *app type: LoadBalancer externalTrafficPolicy: Local loadBalancerIP: ${CLUSTER_LB_FRIGATE} @@ -91,7 +93,7 @@ spec: enabled: true port: 8554 ingress: - main: + app: enabled: true annotations: nginx.ingress.kubernetes.io/auth-method: GET @@ -106,7 +108,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: @@ -120,14 +122,13 @@ spec: config-file: type: configMap name: frigate-configmap - readOnly: true globalMounts: - path: /config/config.yml subPath: config.yml readOnly: true media: type: nfs - server: "192.168.9.10" + server: ${LOCAL_LAN_TRUENAS} path: /mnt/storage/apps/frigate globalMounts: - path: /media/frigate @@ -142,6 +143,6 @@ spec: hostPath: /dev/bus/usb hostPathType: Directory advancedMounts: - main: - main: + frigate: + app: - path: /dev/bus/usb diff --git a/kubernetes/apps/default/ghostfolio/app/helmrelease.yaml b/kubernetes/apps/default/ghostfolio/app/helmrelease.yaml index ddf5d9a12..1d20e5836 100644 --- a/kubernetes/apps/default/ghostfolio/app/helmrelease.yaml +++ b/kubernetes/apps/default/ghostfolio/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/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: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s @@ -23,6 +23,7 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false @@ -31,7 +32,7 @@ spec: namespace: database values: controllers: - main: + ghostfolio: strategy: RollingUpdate annotations: reloader.stakater.com/auto: "true" @@ -44,7 +45,7 @@ spec: - secretRef: name: ghostfolio-secret containers: - main: + app: image: repository: docker.io/ghostfolio/ghostfolio tag: 2.66.3@sha256:cbd0cfaa200fc3b180b6880041268cc7c35197ff34a8ee5d9ca5448ce518a181 @@ -58,14 +59,15 @@ spec: cpu: 100m memory: 256Mi service: - main: + app: + controller: *app ports: http: port: 3333 ingress: - main: + app: enabled: true - className: "nginx" + className: nginx annotations: hajimari.io/icon: mdi:cash-multiple hosts: @@ -73,7 +75,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/default/home-assistant/app/helmrelease.yaml b/kubernetes/apps/default/home-assistant/app/helmrelease.yaml index 9f07a4641..3f303d456 100644 --- a/kubernetes/apps/default/home-assistant/app/helmrelease.yaml +++ b/kubernetes/apps/default/home-assistant/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/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: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s @@ -23,6 +23,7 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false @@ -36,7 +37,7 @@ spec: nodeSelector: nodo.feature.node.kubernetes.io/rflink: "true" controllers: - main: + home-assistant: annotations: reloader.stakater.com/auto: "true" initContainers: @@ -48,7 +49,7 @@ spec: - secretRef: name: home-assistant-secret containers: - main: + app: image: repository: ghcr.io/onedr0p/home-assistant tag: 2024.3.3@sha256:a4c2b7a75e8d5168a9e9f78d9d9f7f36435e2da07899e7faf5f6e3cdc4eebe56 @@ -73,7 +74,8 @@ spec: securityContext: privileged: true service: - main: + app: + controller: *app type: LoadBalancer loadBalancerIP: ${CLUSTER_LB_HASS} externalTrafficPolicy: Local @@ -81,9 +83,9 @@ spec: http: port: 8123 ingress: - main: + app: enabled: true - className: "nginx" + className: nginx annotations: hajimari.io/icon: mdi:home-assistant hosts: @@ -91,7 +93,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/default/home-assistant/code/helmrelease.yaml b/kubernetes/apps/default/home-assistant/code/helmrelease.yaml index 6064cb30a..b3e611fa4 100644 --- a/kubernetes/apps/default/home-assistant/code/helmrelease.yaml +++ b/kubernetes/apps/default/home-assistant/code/helmrelease.yaml @@ -1,16 +1,16 @@ --- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: - name: home-assistant-code + name: &app home-assistant-code namespace: default spec: interval: 30m chart: spec: chart: app-template - version: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s @@ -22,6 +22,7 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false @@ -33,25 +34,25 @@ spec: nodeSelector: nodo.feature.node.kubernetes.io/rflink: "true" controllers: - main: + home-assistant-code: annotations: reloader.stakater.com/auto: "true" containers: - main: + app: image: repository: ghcr.io/coder/code-server tag: 4.22.1@sha256:62e1d2596d564f2f44c0ca710c8790cf4267fdfb183c9c761d272778ad51b217 env: TZ: ${TIMEZONE} - GIT_SSH_COMMAND: "ssh -i /config/.ssh/id_ed25519 -o IdentitiesOnly=yes" + GIT_SSH_COMMAND: ssh -i /config/.ssh/id_ed25519 -o IdentitiesOnly=yes args: - --auth - - "none" + - none - --user-data-dir - - "/config/.vscode" + - /config/.vscode - --extensions-dir - - "/config/.vscode" - - "--port" + - /config/.vscode + - --port - "8888" - /config resources: @@ -67,7 +68,8 @@ spec: fsGroup: 0 fsGroupChangePolicy: OnRootMismatch service: - main: + app: + controller: *app ports: http: port: 8888 @@ -80,7 +82,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: