From f531758d9edadcc296b6761d5cddbbf282960e76 Mon Sep 17 00:00:00 2001 From: auricom <27022259+auricom@users.noreply.github.com> Date: Tue, 14 Mar 2023 22:43:33 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20immich?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/default/immich/app/configmap.yaml | 4 +- .../default/immich/app/kustomization.yaml | 1 + .../app/machine-learning/helmrelease.yaml | 8 ++-- .../immich/app/microservices/helmrelease.yaml | 8 ++-- .../default/immich/app/redis/helmrelease.yaml | 46 +++++++++++++++++++ .../immich/app/redis/kustomization.yaml | 6 +++ .../immich/app/server/helmrelease.yaml | 13 ++++-- .../default/immich/app/web/helmrelease.yaml | 8 ++-- 8 files changed, 76 insertions(+), 18 deletions(-) create mode 100644 kubernetes/apps/default/immich/app/redis/helmrelease.yaml create mode 100644 kubernetes/apps/default/immich/app/redis/kustomization.yaml diff --git a/kubernetes/apps/default/immich/app/configmap.yaml b/kubernetes/apps/default/immich/app/configmap.yaml index a64fbdbb2..564d999ea 100644 --- a/kubernetes/apps/default/immich/app/configmap.yaml +++ b/kubernetes/apps/default/immich/app/configmap.yaml @@ -10,7 +10,9 @@ data: ENABLE_MAPBOX: "false" LOG_LEVEL: verbose NODE_ENV: "production" - REDIS_HOSTNAME: redis-lb.default.svc.cluster.local + # REDIS_HOSTNAME: redis-lb.default.svc.cluster.local + # REDIS_DBINDEX: "10" + REDIS_HOSTNAME: immich-redis.default.svc.cluster.local REDIS_PORT: "6379" REDIS_DBINDEX: "10" IMMICH_WEB_URL: http://immich-web.default.svc.cluster.local:3000 diff --git a/kubernetes/apps/default/immich/app/kustomization.yaml b/kubernetes/apps/default/immich/app/kustomization.yaml index 9f642e57f..5045b8dd9 100644 --- a/kubernetes/apps/default/immich/app/kustomization.yaml +++ b/kubernetes/apps/default/immich/app/kustomization.yaml @@ -8,6 +8,7 @@ resources: - ./microservices - ./machine-learning - ./secret.sops.yaml + - ./redis - ./server - ./volume.yaml - ./web diff --git a/kubernetes/apps/default/immich/app/machine-learning/helmrelease.yaml b/kubernetes/apps/default/immich/app/machine-learning/helmrelease.yaml index 81641de4a..368be515c 100644 --- a/kubernetes/apps/default/immich/app/machine-learning/helmrelease.yaml +++ b/kubernetes/apps/default/immich/app/machine-learning/helmrelease.yaml @@ -30,16 +30,13 @@ spec: - name: immich-server values: controller: - replicas: 3 + replicas: 2 strategy: RollingUpdate annotations: reloader.stakater.com/auto: "true" image: repository: ghcr.io/immich-app/immich-machine-learning tag: v1.50.1 - command: /bin/sh - args: - - ./entrypoint.sh envFrom: - secretRef: name: immich-secret @@ -55,6 +52,9 @@ spec: enabled: true existingClaim: immich-nfs mountPath: /usr/src/app/upload + cache: + enabled: true + type: emptyDir topologySpreadConstraints: - maxSkew: 1 topologyKey: kubernetes.io/hostname diff --git a/kubernetes/apps/default/immich/app/microservices/helmrelease.yaml b/kubernetes/apps/default/immich/app/microservices/helmrelease.yaml index c91004fcf..9c5e9bcf5 100644 --- a/kubernetes/apps/default/immich/app/microservices/helmrelease.yaml +++ b/kubernetes/apps/default/immich/app/microservices/helmrelease.yaml @@ -28,7 +28,7 @@ spec: keepHistory: false values: controller: - replicas: 3 + replicas: 2 strategy: RollingUpdate annotations: reloader.stakater.com/auto: "true" @@ -60,7 +60,7 @@ spec: app.kubernetes.io/name: *app resources: requests: - cpu: 10m - memory: 100Mi + cpu: 100m + memory: 250Mi limits: - memory: 500Mi + memory: 1000Mi diff --git a/kubernetes/apps/default/immich/app/redis/helmrelease.yaml b/kubernetes/apps/default/immich/app/redis/helmrelease.yaml new file mode 100644 index 000000000..56fdb2aaa --- /dev/null +++ b/kubernetes/apps/default/immich/app/redis/helmrelease.yaml @@ -0,0 +1,46 @@ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.devbu.io/helmrelease_v2beta1.json +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease +metadata: + name: immich-redis + namespace: default +spec: + interval: 15m + chart: + spec: + chart: app-template + version: 1.3.2 + sourceRef: + kind: HelmRepository + name: bjw-s + namespace: flux-system + maxHistory: 3 + install: + createNamespace: true + remediation: + retries: 3 + upgrade: + cleanupOnFail: true + remediation: + retries: 3 + uninstall: + keepHistory: false + values: + image: + repository: public.ecr.aws/docker/library/redis + tag: 7.0.9 + env: + REDIS_REPLICATION_MODE: master + command: ["redis-server"] + service: + main: + ports: + http: + port: 6379 + resources: + requests: + cpu: 10m + memory: 10Mi + limits: + memory: 100Mi diff --git a/kubernetes/apps/default/immich/app/redis/kustomization.yaml b/kubernetes/apps/default/immich/app/redis/kustomization.yaml new file mode 100644 index 000000000..17cbc72b2 --- /dev/null +++ b/kubernetes/apps/default/immich/app/redis/kustomization.yaml @@ -0,0 +1,6 @@ +--- +# yaml-language-server: $schema=https://json.schemastore.org/kustomization +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ./helmrelease.yaml diff --git a/kubernetes/apps/default/immich/app/server/helmrelease.yaml b/kubernetes/apps/default/immich/app/server/helmrelease.yaml index 97b7b2f19..938225b11 100644 --- a/kubernetes/apps/default/immich/app/server/helmrelease.yaml +++ b/kubernetes/apps/default/immich/app/server/helmrelease.yaml @@ -26,15 +26,18 @@ spec: retries: 3 uninstall: keepHistory: false + dependsOn: + - name: immich-redis values: initContainers: - init-db: + 01-init-db: image: ghcr.io/onedr0p/postgres-initdb:14.7 + imagePullPolicy: IfNotPresent envFrom: - secretRef: name: immich-secret controller: - replicas: 3 + replicas: 2 strategy: RollingUpdate annotations: reloader.stakater.com/auto: "true" @@ -68,7 +71,7 @@ spec: app.kubernetes.io/name: *app resources: requests: - cpu: 10m - memory: 100Mi + cpu: 100m + memory: 250Mi limits: - memory: 500Mi + memory: 1000Mi diff --git a/kubernetes/apps/default/immich/app/web/helmrelease.yaml b/kubernetes/apps/default/immich/app/web/helmrelease.yaml index 4b5a2e82f..f047fd2e6 100644 --- a/kubernetes/apps/default/immich/app/web/helmrelease.yaml +++ b/kubernetes/apps/default/immich/app/web/helmrelease.yaml @@ -30,7 +30,7 @@ spec: - name: immich-server values: controller: - replicas: 3 + replicas: 2 strategy: RollingUpdate annotations: reloader.stakater.com/auto: "true" @@ -89,7 +89,7 @@ spec: app.kubernetes.io/name: *app resources: requests: - cpu: 10m - memory: 100Mi + cpu: 100m + memory: 250Mi limits: - memory: 500Mi + memory: 1000Mi