From c49945a289804901056e4d4af01895505cc4ea0c Mon Sep 17 00:00:00 2001
From: Peter Kurfer <peter@icb4dc0.de>
Date: Thu, 10 Oct 2024 21:33:02 +0200
Subject: [PATCH] refactor: switch to hclod object storage

---
 cnpg/cluster/resources/pool.yaml                |   3 ++-
 forgejo/config/values.forgejo.yaml              |   8 ++++----
 .../resources/secrets/infra-credentials.yaml    | Bin 894 -> 834 bytes
 garage/migrate/resources/job.migrate.yaml       |   6 +++---
 umami/resources/deployment.yaml                 |  12 ++++++------
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/cnpg/cluster/resources/pool.yaml b/cnpg/cluster/resources/pool.yaml
index 5ada772..45f69e4 100644
--- a/cnpg/cluster/resources/pool.yaml
+++ b/cnpg/cluster/resources/pool.yaml
@@ -14,5 +14,6 @@ spec:
     parameters:
       max_client_conn: "1000"
       default_pool_size: "10"
+      ignore_startup_parameters: "search_path"
   monitoring:
-    enablePodMonitor: true
\ No newline at end of file
+    enablePodMonitor: true
diff --git a/forgejo/config/values.forgejo.yaml b/forgejo/config/values.forgejo.yaml
index 29a27fe..0012918 100644
--- a/forgejo/config/values.forgejo.yaml
+++ b/forgejo/config/values.forgejo.yaml
@@ -65,10 +65,10 @@ gitea:
       PROVIDER_CONFIG: redis://forgejo-session.forgejo.svc:6379/0?pool_size=100&idle_timeout=180s&
     storage:
       STORAGE_TYPE: minio
-      MINIO_ENDPOINT: garage.garage.svc:3900
-      MINIO_BUCKET: forgejo
-      MINIO_LOCATION: hel1
-      MINIO_USE_SSL: "false"
+      MINIO_ENDPOINT: fsn1.your-objectstorage.com:443
+      MINIO_BUCKET: 1661580-forgejo
+      MINIO_LOCATION: auto
+      MINIO_USE_SSL: "true"
     indexer:
       ISSUE_INDEXER_TYPE: meilisearch
       ISSUE_INDEXER_NAME: gitea_issues
diff --git a/forgejo/resources/secrets/infra-credentials.yaml b/forgejo/resources/secrets/infra-credentials.yaml
index 5dd292ee99f57f32aa4d389bef92ddeef585a862..b4422b36332179fc61155827259cc3f67a129dc1 100644
GIT binary patch
delta 815
zcmV+~1JL~b2EqoAAb&YgN^wC(cvv$?XhL#DP)jy>FGNUnZ*@^HMOsu?IdXABab-+b
zRCG;eMG9qfO*LpRT4+dPS58@ZN=tBTa6)-(VQgkrS~psBY;sj~S4}f7a!_n%MG7rG
zAXqXrH8D9LNMS-{OKVqoWkhc_Y*b=Rc}{6HQ$sXmFJ@^=Pk(kcOGH^QbWtm5R(Ne$
z3Qsq6OG$EbO?Xx_WKvahFk@LmHgQo)Fm82XQZ{TWWH2!+V{=hwI9fL_3N0-yAZKJN
zb7fLDSZz!*R(f(PD_U4tWm!izOlLA-RB32VZFzY#LRwU7V`@2X3d?#}V!I&F&G9sE
zDp5Zq=b85sPk(r-ziK}sb_-<{48qv$(*P-ar!sLpJ6)I@(gnlM3P;GMO#bCPLp$bI
zS8^fu88%ovCP<H*`L~qHWH$^pxbpRb*2L6|H&M?ep^LRyZ@hF%y(41JtzF4Ee8n2w
ze3^UzV!4dVmEhoDy{bNF%|aOpLt?k*wG5A_0ax89CV!_xKExqEaaj#%iZTj^fSYb0
zev0%rV7B@`rpYi)q5-RW4Gt9&!j+g>mLk(I0mnN6u~#v{*>!`?bQT<V?PmzFm&Oz0
zQ}6?{gJoygN=XC`#Mtd+UOj}D8&=7}B3m})ox_S!f#<QOai19t^bsJpK_*gjg65La
z=Lj>uV1G&isEYXZ=m2JV2Zghak+5UId7ig20KH=J(;6}>zf@-$Zq~+9^D1H@N~IBf
zi$5p2G3@HOFY7xz4Kkd`2*!HgVY;mGa_E7|w_=<H-H|z|Cz<~#Kc?B@JB4dy53&ok
zgMc&}i2n+o4R#s`v3ROe1nFe3%smNUe>S}p4u5Cn5f4!kbES!j`sJV%a(Gu12L-L7
zG_Y%W0@NvnwGdwMvar#N*cQq>Tz+HIMVM;t{SU!Z3B<8ufYkbJ^U;iocJLJ<Z;dA9
zF}T7g{pDbT&ToKcdsm_%X@C~Vcm`H|YnVL7ZQY-|mH%J!dSM=}#4cCo<-kRu{tene
tH7HWxDUrG9N=KGvKyEYOefI@oH3H2Bu`;u(fZ)#sfryj?R*tKIK=NU#U~>Qf

delta 875
zcmV-x1C;#22L1++Ab)RqPiZk(XG2g|V>nlKQ*bj#MOSBaIdo`hZ$)xfFEBQ8FLQcr
zVr*|RNeWS6Mr<=kYiD*hL@Q@OZCPSDZ+U7%czAJmLPBP4Z(1u<WJh5&H+XDCO$seO
zAXqXrH8D9LOIU15OgBqqOHDFUcQ09bM|N0BXje66T25puGJi8PV{&0}bV+G8b!bRq
z3VLc-S1&PDba{7cO<`qDM^$2PG)qZGIZ;eELUvMPLS%PEMOH^EXlh3^3N0-yAb2)S
zcX2d#O-@5^YGh4MXIFYTQ(}2$Nl<8NWMxKAQbTZ5L`iW`P*P%N3N?nfO7rt#{W-Od
z4Qm@D<c8)m-+x=hD=o`>LY-?~piSD$`6VfKI*rO2Y{v<~tP*(gH00&KPmv^OW(!o^
z(Y5fA7i2_HDgn1=j!Pm&fB!RA4p7?}<5wY=va~UvLNJYwZQG9IyMXs&tX8+|ZDvF7
zJUv2J+$ztc_bliQ3zas@bx%1A!MojNc8S^OS`dT=xPQ$S`sL8RS7kDOoiq%Ut8i95
z^+1!d#0)$Oln=*lvZ+_X=!jsYY!I{|Q_KS4qeuy+)16JPZ|0ENED2)4v~dtGb3Lhp
z$s-V5#VD2pgis+(!INkpvAAK^25R=Vb}~O_`j>!t=zIP&9%F(<mfJ+oeD3hYpE7)W
zaPmxjvVVy!)2bdL=$q>%>x%mQO$hxq(nSGbBQXNboHrWvD-W4RqieWTz<!eqGo+`y
z5vOtttM+$z1v=wrSA{gd{Qh8(M{yzYnNqw~#kARC|H5{C)uf63SS53QG?7Pt5VH!}
zbN8lhU`7zgYwAn<3GLIc=3}z;mX$oYW|*DpRDX)t#4yI6>F=|`#yHs-;5pjfHiGu+
znU34lMz%uB-zV86{F5N?r;kP5oCczgVY^P+DA+h$0nwqTvl*}<YNQug9A<|EbQg4=
z+mQW}<vax=zy^+1t(Ny#i&yHc6Sqgq{O46ar{O*$!CSoGC^K4*Gx67BmTGYz<AZvk
z^kk+{b4&Vke2M9YvHCt$2{(xLZo+)&LEAC5?nc6-hMhmo$X7Zx$6&!n=s9{>91Fna
zBA}Wsrb3}PDXg`a?H&T;Q|MJ-b1@DWYyYslnu!jg6%X~89xJ7<F7mZ`&N?sdhq43w
BkktSH

diff --git a/garage/migrate/resources/job.migrate.yaml b/garage/migrate/resources/job.migrate.yaml
index 26ab5f1..73c86c4 100644
--- a/garage/migrate/resources/job.migrate.yaml
+++ b/garage/migrate/resources/job.migrate.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: sync-garage-blog
+  name: sync-garage-forgejo
   namespace: garage
 spec:
   ttlSecondsAfterFinished: 100
@@ -20,8 +20,8 @@ spec:
             - --ignore-errors
             - -s3-upload-concurrency 64
             - -v
-            - garage:blog
-            - hcloud:1661580-blog
+            - garage:forgejo
+            - hcloud:1661580-forgejo
           volumeMounts:
             - name: rclone-config
               mountPath: /config/rclone
diff --git a/umami/resources/deployment.yaml b/umami/resources/deployment.yaml
index 49b7b5d..6b9c6fb 100644
--- a/umami/resources/deployment.yaml
+++ b/umami/resources/deployment.yaml
@@ -4,7 +4,7 @@ kind: Deployment
 metadata:
   name: umami
 spec:
-  replicas: 2
+  replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: umami
@@ -25,7 +25,7 @@ spec:
             - name: DATABASE_URL
               valueFrom:
                 secretKeyRef:
-                  name: db-credentials-umami
+                  name: default-cluster-pguser-umami
                   key: PQ_URL
           envFrom:
             - configMapRef:
@@ -66,9 +66,9 @@ spec:
               memory: "256Mi"
               cpu: "300m"
           ports:
-          - containerPort: 3000
-            protocol: TCP
-            name: web
+            - containerPort: 3000
+              protocol: TCP
+              name: web
           livenessProbe:
             httpGet:
               path: /api/heartbeat
@@ -100,4 +100,4 @@ spec:
       securityContext:
         runAsUser: 1000
         runAsGroup: 1000
-        runAsNonRoot: true
\ No newline at end of file
+        runAsNonRoot: true