From 63d1a80db8a0df6f4309c3a55a23c88a222a8898 Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Mon, 11 Dec 2023 12:33:53 +0100 Subject: [PATCH] readability improvements --- apps/adguard/configmap.yaml | 2 +- apps/adguard/deployment.yaml | 2 +- apps/adguard/kustomization.yaml | 5 +++++ apps/homeassistant/deployment.yaml | 2 +- apps/homeassistant/kustomization.yaml | 22 +++++++++----------- apps/immich/values.yaml | 30 ++++----------------------- apps/media/kustomization.yaml | 10 ++++++++- apps/media/server.deployment.yaml | 2 +- apps/media/web.deployment.yaml | 2 +- apps/ntfy/kustomization.yaml | 5 +++++ 10 files changed, 38 insertions(+), 44 deletions(-) diff --git a/apps/adguard/configmap.yaml b/apps/adguard/configmap.yaml index b9bd3f6..0c9a537 100644 --- a/apps/adguard/configmap.yaml +++ b/apps/adguard/configmap.yaml @@ -156,7 +156,7 @@ data: filters_update_interval: 24 blocked_response_ttl: 10 filtering_enabled: true - parental_enabled: false + parental_enabled: true safebrowsing_enabled: false protection_enabled: true clients: diff --git a/apps/adguard/deployment.yaml b/apps/adguard/deployment.yaml index b1756f6..1525daa 100644 --- a/apps/adguard/deployment.yaml +++ b/apps/adguard/deployment.yaml @@ -34,7 +34,7 @@ spec: env: - name: TZ value: Europe/Berlin - image: adguard/adguardhome:v0.107.41 + image: adguard/adguardhome imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/apps/adguard/kustomization.yaml b/apps/adguard/kustomization.yaml index 90ec6af..a638b72 100644 --- a/apps/adguard/kustomization.yaml +++ b/apps/adguard/kustomization.yaml @@ -7,5 +7,10 @@ resources: - service.yaml - deployment.yaml +images: + - name: adguard/adguardhome + newName: adguard/adguardhome + newTag: v0.107.41 + namespace: adguard diff --git a/apps/homeassistant/deployment.yaml b/apps/homeassistant/deployment.yaml index 6f5ce3a..b65d613 100644 --- a/apps/homeassistant/deployment.yaml +++ b/apps/homeassistant/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: homeassistant - image: homeassistant/home-assistant:2023.11 + image: homeassistant/home-assistant ports: - containerPort: 8123 env: diff --git a/apps/homeassistant/kustomization.yaml b/apps/homeassistant/kustomization.yaml index 45e12ab..755a8c1 100644 --- a/apps/homeassistant/kustomization.yaml +++ b/apps/homeassistant/kustomization.yaml @@ -1,18 +1,16 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -resources: -- namespace.yaml -- ingress.yaml -- pvc.yaml -- service.yaml -- deployment.yaml namespace: homeassistant +resources: + - namespace.yaml + - ingress.yaml + - pvc.yaml + - service.yaml + - deployment.yaml -# helmCharts: -# - name: home-assistant -# releaseName: homeassistant -# version: 13.4.2 -# valuesFile: values.yaml -# repo: https://k8s-at-home.com/charts/ +images: + - name: homeassistant/home-assistant + newName: homeassistant/home-assistant + newTag: "2023.11" diff --git a/apps/immich/values.yaml b/apps/immich/values.yaml index 2e3bf43..794e14e 100644 --- a/apps/immich/values.yaml +++ b/apps/immich/values.yaml @@ -2,6 +2,10 @@ ## You can find it at https://github.com/bjw-s/helm-charts/tree/main/charts/library/common ## Refer there for more detail about the supported values + +image: + tag: v1.90.2 + # These entries are shared between all the Immich components env: @@ -29,9 +33,6 @@ env: IMMICH_SERVER_URL: '{{ printf "http://%s-server:3001" .Release.Name }}' IMMICH_MACHINE_LEARNING_URL: '{{ printf "http://%s-machine-learning:3003" .Release.Name }}' -image: - tag: v1.89.0 - immich: persistence: # Main data store for all photos shared between different components. @@ -45,7 +46,6 @@ immich: postgresql: enabled: false - redis: enabled: true architecture: standalone @@ -63,29 +63,17 @@ typesense: enabled: true accessMode: ReadWriteOnce size: 1Gi - # storageClass: storage-class - image: - repository: docker.io/typesense/typesense - tag: 0.24.0 - pullPolicy: IfNotPresent # Immich components server: enabled: true - - image: - repository: ghcr.io/immich-app/immich-server - pullPolicy: IfNotPresent - ingress: main: enabled: false microservices: enabled: true - env: - REVERSE_GEOCODING_DUMP_DIRECTORY: /geodata-cache persistence: geodata-cache: enabled: true @@ -93,18 +81,9 @@ microservices: # Optional: Set this to pvc to avoid downloading the geodata every start. type: emptyDir accessMode: ReadWriteMany - # storageClass: your-class - image: - repository: ghcr.io/immich-app/immich-server - pullPolicy: IfNotPresent machine-learning: enabled: true - image: - repository: ghcr.io/immich-app/immich-machine-learning - pullPolicy: IfNotPresent - env: - TRANSFORMERS_CACHE: /cache persistence: cache: enabled: true @@ -112,4 +91,3 @@ machine-learning: # Optional: Set this to pvc to avoid downloading the ML models every start. type: emptyDir accessMode: ReadWriteMany - # storageClass: your-class diff --git a/apps/media/kustomization.yaml b/apps/media/kustomization.yaml index 4c97136..5949f68 100644 --- a/apps/media/kustomization.yaml +++ b/apps/media/kustomization.yaml @@ -1,5 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +namespace: media + resources: - namespace.yaml - pvc.yaml @@ -9,4 +11,10 @@ resources: - web.service.yaml - ingress.yaml -namespace: media +images: + - name: jellyfin/jellyfin + newName: jellyfin/jellyfin + newTag: 10.8.9 + - name: ghcr.io/jellyfin/jellyfin-vue + newName: ghcr.io/jellyfin/jellyfin-vue + newTag: unstable.2023-12-08.63507f2 diff --git a/apps/media/server.deployment.yaml b/apps/media/server.deployment.yaml index bd76191..01cba77 100644 --- a/apps/media/server.deployment.yaml +++ b/apps/media/server.deployment.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: jellyfin-server - image: jellyfin/jellyfin:10.8.9 + image: jellyfin/jellyfin resources: limits: memory: "500Mi" diff --git a/apps/media/web.deployment.yaml b/apps/media/web.deployment.yaml index a83ab2e..42ea177 100644 --- a/apps/media/web.deployment.yaml +++ b/apps/media/web.deployment.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: jellyfin-web - image: ghcr.io/jellyfin/jellyfin-vue:unstable.2023-12-08.63507f2 + image: ghcr.io/jellyfin/jellyfin-vue resources: limits: memory: "128Mi" diff --git a/apps/ntfy/kustomization.yaml b/apps/ntfy/kustomization.yaml index a335767..0cad525 100644 --- a/apps/ntfy/kustomization.yaml +++ b/apps/ntfy/kustomization.yaml @@ -9,3 +9,8 @@ resources: - deployment.yaml - service.yaml - ingress.yaml + +images: + - name: binwiederhier/ntfy + newName: binwiederhier/ntfy + newTag: 2.8.0