chore(apps/image-host): replace with caddy

invakid404 · Sep 20, 2024 · dead116 · dead116
1 parent deade44
commit dead116
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 35 deletions.
diff --git a/apps/image-host/secret.yaml b/apps/image-host/secret.yaml
@@ -5,23 +5,16 @@ metadata:
     name: image-host
     namespace: apps
 stringData:
-    DATABASE_URL: ENC[AES256_GCM,data:8WWrUQjVU2OLjdU2R91QlE0pGb/aZ9AaY15tBoXZ6g8qfnFSU+3goHCz/Oj8KpYnESHFcEuZVmgwSDhLygmI8VKAXP73kJYPJJTy0c6e8Lp1f4WJpPpk7ML7b+KOGQ9KcV/Pexk=,iv:zT1h+slwqspJGS/HtAg1g4Kx3ybsXhJt8TXe/Los6QE=,tag:bMQffZsBsoBSk7Ph0hg87Q==,type:str]
-    AWS_ACCESS_KEY_ID: ENC[AES256_GCM,data:HyJULgMP3IU0A7RsEHepKF+5m483mTaKXRzOVjlcMrc=,iv:Lqh+H7Jnr2/e3wJyz+m4fpSn3lHhFR0k96GeaxWS4I4=,tag:Fxcnm3u4zA19bjtd8i2IeA==,type:str]
-    AWS_SECRET_ACCESS_KEY: ENC[AES256_GCM,data:GgLufqMtGmQMU158suOsmbKbExsE9GCyUh/Coy4+MVYlc3LGHRi5OSkMptBNwY8VPVswWaAlGclt5wooCrXsUg==,iv:k+9lc1YRQhxJtb+mjBdFi+vw1smt/9ReX2UVpQLkiz4=,tag:cx43T5VdX9YEScUcVcQGCg==,type:str]
-    AWS_API_URL: ENC[AES256_GCM,data:F9kiMGV54hlb+MSPICyK9C0ol0T91CTpUlePCSza5kKL16Qjhuv2wpOZbQWNz1t2C4X/PZ7mdYXUaHzlVWjiG1A=,iv:qNKg3zPJSmh8UlVxtRRkON2IfXCBa8oICwg2mGAoDDc=,tag:pkI//HXDY7m7kA0Esw1ttg==,type:str]
-    AWS_REGION: ENC[AES256_GCM,data:kxe3xA==,iv:p1L5/C22eadslnW9ocyKVP9+rLoczB9egjPlvU5h5Mo=,tag:ARAX3lGKjMsaftG1dF/u6w==,type:str]
-    AWS_S3_BUCKET: ENC[AES256_GCM,data:pf6H4Ut3,iv:aGe5/B3bKMdpsAiO9g70/5KSWrxcK2wctBNcbM+rX1Q=,tag:odzYQy5oeXAT9w9daXkA6w==,type:str]
-    UPLOAD_SECRET_HEADER: ENC[AES256_GCM,data:tKMIFk5vNPSdiXdaeGB4yWnwG6M=,iv:iwlKe8Xbc9tv6YogsTJ/8lX0CDMuF8Ydnqhecr/N6d4=,tag:8MzufahEbfdBHMBz++PKFg==,type:str]
-    UPLOAD_SECRET_VALUE: ENC[AES256_GCM,data:9Eqd6xULD8ptb5DrJF5qZyM=,iv:5tczyF7kE8xoukxDlS5VoJSCsx6AOiX7D708znudmeY=,tag:qKSKks6uTUOSD3iQ02v7mQ==,type:str]
-    LOGGER_FORMAT: ENC[AES256_GCM,data:Fil5mICxkoRUayvseLyfOXtOr38f1xdzo2iFHYytUavcAi9trdiAbkiCj9Ya23LPyMloS4BsWur/hq3yQ+waJg==,iv:JVA8VTbGbExrYEQOUSXbLgR4YVxYLqPX/dTyhxpTb/E=,tag:pIg3Dv9HbJWPutzCDgRrhg==,type:str]
+    WMILL_URL: ENC[AES256_GCM,data:HAb68Sw+VU8avLK3sOnMqwYzN24TfVZZhnGkMqJ3HYLQKOrilk20klhCeMEotO4=,iv:dE18ILwnhd9FuDE6s7oEgOiP1uNST2uqLNu0io66eqM=,tag:xBtu5GrH+l6TfUEC/kWO7A==,type:str]
+    WMILL_TOKEN: ENC[AES256_GCM,data:8BQSyay+0x5yKwdOsft65l7ggQQOjlGoIK6xv9WYO2o=,iv:oCloE8ajuMIdM8loPsJq6XGyxncxD7WQJTjRFYGkSXA=,tag:pbwyVS7gL2EwI8Kd8BwfGA==,type:str]
 sops:
     kms: []
     gcp_kms: []
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2024-04-24T10:29:05Z"
-    mac: ENC[AES256_GCM,data:V40dHkEwCZnCOv19WWnJrkoe0wuZ9o0swTWJCbTRfBVDHt8ybHbuNLGeMomFjbp6/hAoMdOytSFJBUwFI7GZh4czD4qB7XTCCOlIGWjyT85AxuFFVs1W6Tr+Iu1fMW0s2wZ/UKERJGFeUt9QDo+2qYLFNuCejPLVRht9on/wSxw=,iv:gkPjKlj1dZcBIWhqxadqVBQ68+ulez7pg53nCSxJFa8=,tag:J5r9pr2YslR72Y+Uf2H63w==,type:str]
+    lastmodified: "2024-09-20T10:50:02Z"
+    mac: ENC[AES256_GCM,data:iqdNxgMnwiXikMTTIK2xLafXgw5hedzHs0IPfZnMp2PKc30ECGc0PlS4Cn91vrYhXBn3BMKhU13REnBBEeDPra0UlJmxEGZW226dnNIcBNcM2lrjerSnQQg8tOV5KoNmlgTIXOPkO+iVwEaa/ovUJqSk8BEhmvn/lxI+hJp4SI4=,iv:IUIUi2niMvrWBm5U9H1/H555mdu68ff1UIwyY+yEEio=,tag:ZVTC2j+k9mohb+fUiOqhwg==,type:str]
     pgp:
         - created_at: "2024-04-24T10:29:05Z"
           enc: |-
@@ -44,4 +37,4 @@ sops:
             -----END PGP MESSAGE-----
           fp: 05FA72D13D58F8D4588BE3FE5606FFB02A5F0984
     encrypted_regex: ((?i)(pass($|word)|claim|secret($|[^N])|key|token|^data$|^stringData))
-    version: 3.8.1
+    version: 3.9.0
diff --git a/apps/image-host/values.yaml b/apps/image-host/values.yaml
@@ -4,33 +4,15 @@ controllers:
     containers:
       main:
         image:
-          repository: ghcr.io/invakid404/image-host
-          tag: 1.2.7@sha256:3f7eea62b03b8e36aee928b4e5ff546f604c2709fbdeef441e59d51663c86dac
+          repository: caddy
+          tag: 2.8.4@sha256:60c984f83bb0a3c2ac8f9dd067672dd6b8d6719baf1fe712fc52c7b221ce4e02
         envFrom:
           - secretRef:
               name: image-host
-    initContainers:
-      01-init-db:
-        image:
-          repository: ghcr.io/onedr0p/postgres-init
-          tag: 16.1@sha256:dda75857689116d9c233ec0978cb905da0f952618dfbe1b8731aa1071044eaf0
-        env:
-          - name: INIT_POSTGRES_HOST
-            value: postgres.core.svc.cluster.local
-          - name: INIT_POSTGRES_SUPER_USER
-            value: postgres
-          - name: INIT_POSTGRES_SUPER_PASS
-            value: ${POSTGRES_PASSWORD}
-          - name: INIT_POSTGRES_USER
-            value: postgres
-          - name: INIT_POSTGRES_PASS
-            value: ${POSTGRES_PASSWORD}
-          - name: INIT_POSTGRES_DBNAME
-            value: image-host
 
 defaultPodOptions:
-  imagePullSecrets:
-    - name: docker-config
+  annotations:
+    reloader.stakater.com/auto: "true"
 
 service:
   main:
@@ -39,6 +21,14 @@ service:
       http:
         port: 8080
 
+persistence:
+  config:
+    enabled: true
+    type: configMap
+    name: image-host-config
+    globalMounts:
+      - path: /etc/caddy
+
 ingress:
   main:
     enabled: true

diff --git a/clusters/styx/apps/image-host.yaml b/clusters/styx/apps/image-host.yaml
@@ -23,4 +23,4 @@ spec:
       name: sops-gpg
   dependsOn:
     - name: apps-base
-    - name: postgres
+    - name: image-host-config