From 733100e57277bb749fdb1358ce161b0bc5c3de47 Mon Sep 17 00:00:00 2001
From: auricom <27022259+auricom@users.noreply.github.com>
Date: Fri, 6 Oct 2023 00:30:38 +0200
Subject: [PATCH] =?UTF-8?q?fixup!=20=F0=9F=94=A7=20immich?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/immich/app/kustomization.yaml     |  1 +
 .../default/immich/app/proxy/helmrelease.yaml | 63 +++++++++++++++++++
 .../immich/app/proxy/kustomization.yaml       |  6 ++
 .../default/immich/app/web/helmrelease.yaml   | 25 --------
 4 files changed, 70 insertions(+), 25 deletions(-)
 create mode 100644 kubernetes/apps/default/immich/app/proxy/helmrelease.yaml
 create mode 100644 kubernetes/apps/default/immich/app/proxy/kustomization.yaml

diff --git a/kubernetes/apps/default/immich/app/kustomization.yaml b/kubernetes/apps/default/immich/app/kustomization.yaml
index 77b9928a4..9ce031bbc 100644
--- a/kubernetes/apps/default/immich/app/kustomization.yaml
+++ b/kubernetes/apps/default/immich/app/kustomization.yaml
@@ -8,6 +8,7 @@ resources:
   - ./externalsecret.yaml
   - ./gatus.yaml
   - ./microservices
+  - ./proxy
   - ./machine-learning
   - ./server
   - ./typesense
diff --git a/kubernetes/apps/default/immich/app/proxy/helmrelease.yaml b/kubernetes/apps/default/immich/app/proxy/helmrelease.yaml
new file mode 100644
index 000000000..00d9d1a7a
--- /dev/null
+++ b/kubernetes/apps/default/immich/app/proxy/helmrelease.yaml
@@ -0,0 +1,63 @@
+---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta1.json
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: immich-proxy
+spec:
+  interval: 15m
+  chart:
+    spec:
+      chart: app-template
+      version: 1.5.1
+      sourceRef:
+        kind: HelmRepository
+        name: bjw-s
+        namespace: flux-system
+      interval: 15m
+  install:
+    createNamespace: true
+    remediation:
+      retries: 5
+  upgrade:
+    remediation:
+      retries: 5
+  dependsOn:
+    - name: immich-server
+  values:
+    controller:
+      strategy: RollingUpdate
+      annotations:
+        configmap.reloader.stakater.com/reload: &configMap immich-configmap
+    image:
+      repository: ghcr.io/immich-app/immich-proxy
+      tag: v1.81.1
+    service:
+      main:
+        ports:
+          http:
+            port: 8080
+    ingress:
+      main:
+        enabled: true
+        ingressClassName: nginx
+        annotations:
+          external-dns.home.arpa/enabled: "true"
+          hajimari.io/appName: Immich
+          hajimari.io/icon: mdi:image-album
+          nginx.ingress.kubernetes.io/proxy-body-size: "0"
+        hosts:
+          - host: &host photos.${SECRET_CLUSTER_DOMAIN}
+            paths:
+              - path: /
+                pathType: Prefix
+        tls:
+          - hosts:
+              - *host
+    resources:
+      requests:
+        cpu: 100m
+        memory: 250Mi
+    envFrom:
+      - configMapRef:
+          name: *configMap
diff --git a/kubernetes/apps/default/immich/app/proxy/kustomization.yaml b/kubernetes/apps/default/immich/app/proxy/kustomization.yaml
new file mode 100644
index 000000000..09bc749a9
--- /dev/null
+++ b/kubernetes/apps/default/immich/app/proxy/kustomization.yaml
@@ -0,0 +1,6 @@
+---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/kustomization.json
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ./helmrelease.yaml
diff --git a/kubernetes/apps/default/immich/app/web/helmrelease.yaml b/kubernetes/apps/default/immich/app/web/helmrelease.yaml
index 8a0433dfb..5afc29c5d 100644
--- a/kubernetes/apps/default/immich/app/web/helmrelease.yaml
+++ b/kubernetes/apps/default/immich/app/web/helmrelease.yaml
@@ -48,31 +48,6 @@ spec:
         ports:
           http:
             port: 3000
-    ingress:
-      main:
-        enabled: true
-        ingressClassName: nginx
-        annotations:
-          external-dns.home.arpa/enabled: "true"
-          hajimari.io/appName: Immich
-          hajimari.io/icon: mdi:image-album
-          nginx.ingress.kubernetes.io/configuration-snippet: |
-            rewrite /api/(.*) /$1 break;
-          nignx.ingress.kubernetes.io/force-ssl-redirect: "true"
-          nginx.ingress.kubernetes.io/proxy-body-size: "0"
-        hosts:
-          - host: &host photos.${SECRET_CLUSTER_DOMAIN}
-            paths:
-              - path: /
-                pathType: Prefix
-              - path: /api
-                pathType: Prefix
-                service:
-                  name: immich-server
-                  port: 3001
-        tls:
-          - hosts:
-              - *host
     podSecurityContext:
       runAsUser: 568
       runAsGroup: 568