From 45dc6a383aa7a9e48dacf01f27773aecee0221ab Mon Sep 17 00:00:00 2001
From: Peter Kurfer <peter@icb4dc0.de>
Date: Tue, 7 May 2024 11:10:16 +0200
Subject: [PATCH] chore(forgejo): migrate to Garage

---
 forgejo/config/values.forgejo.yaml            |  24 ++++++++----------
 .../resources/secrets/infra-credentials.yaml  | Bin 976 -> 964 bytes
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/forgejo/config/values.forgejo.yaml b/forgejo/config/values.forgejo.yaml
index 1a45bb8..ca1f8a2 100644
--- a/forgejo/config/values.forgejo.yaml
+++ b/forgejo/config/values.forgejo.yaml
@@ -62,14 +62,13 @@ gitea:
       DEFAULT_USER_IS_RESTRICTED: 'true'
     session:
       PROVIDER: redis
-      PROVIDER_CONFIG: redis://forgejo-session.forgejo.svc.cluster.local:6379/0?pool_size=100&idle_timeout=180s&
+      PROVIDER_CONFIG: redis://forgejo-session.forgejo.svc:6379/0?pool_size=100&idle_timeout=180s&
     storage:
       STORAGE_TYPE: minio
-      MINIO_ENDPOINT: 2df513adaee2eeae12106af900bed297.r2.cloudflarestorage.com:443
-      MINIO_BUCKET: gitea
-      MINIO_LOCATION: us-east-1
-      MINIO_USE_SSL: 'true'
-      MINIO_CHECKSUM_ALGORITHM: md5
+      MINIO_ENDPOINT: garage.garage.svc:3900
+      MINIO_BUCKET: forgejo
+      MINIO_LOCATION: hel1
+      MINIO_USE_SSL: 'false'
     indexer:
       ISSUE_INDEXER_TYPE: meilisearch
       ISSUE_INDEXER_NAME: gitea_issues
@@ -82,11 +81,10 @@ gitea:
       MAX_SIZE: 30
       MAX_FILES: 15
       STORAGE_TYPE: minio
-      MINIO_ENDPOINT: 2df513adaee2eeae12106af900bed297.r2.cloudflarestorage.com:443
-      MINIO_BUCKET: gitea
-      MINIO_LOCATION: us-east-1
-      MINIO_USE_SSL: 'true'
-      MINIO_CHECKSUM_ALGORITHM: md5
+      MINIO_ENDPOINT: garage.garage.svc:3900
+      MINIO_BUCKET: forgejo
+      MINIO_LOCATION: hel1
+      MINIO_USE_SSL: 'false'
     actions:
       ENABLED: 'true'
       DEFAULT_ACTIONS_URL: github
@@ -101,10 +99,10 @@ gitea:
     cache:
       ENABLED: true
       ADAPTER: redis
-      HOST: redis://forgejo-session.forgejo.svc.cluster.local:6379/0?pool_size=100&idle_timeout=180s&
+      HOST: redis://forgejo-session.forgejo.svc:6379/0?pool_size=100&idle_timeout=180s&
     queue:
       TYPE: redis
-      CONN_STR: redis://forgejo-session.forgejo.svc.cluster.local:6379/0?pool_size=100&idle_timeout=180s&
+      CONN_STR: redis://forgejo-session.forgejo.svc:6379/0?pool_size=100&idle_timeout=180s&
     metrics:
       ENABLED: true
 
diff --git a/forgejo/resources/secrets/infra-credentials.yaml b/forgejo/resources/secrets/infra-credentials.yaml
index 476f10ea7f9bd9c8a3137f8368bd2aaa2fe090c9..0f9a1ba54348c242ff9723419156a46f9939b959 100644
GIT binary patch
delta 946
zcmV;j15NzU2gC=EAb)dna%nk5c~MGLc{X})Sy)UtOlo&WOgC#*Z!<(sH&aPkD@{{&
zMR86>O$t{uYECdKPIy5uHDgeCGI3gTMov&uMp0o%QEOCYOG8*yHCkzJT2fg^K?*HC
zAXqXrH8D9LNkmySbZ%!=VQ4{DN>NvIQdCn#YcfMHLupZCQGZV_H+OAuLN9o9L^DWh
z3UqTZN@;6vNNjgwdQ5dhHdc6IIc-E$IZ<VKI4d|gMs+Ykct}t=Nn=uL3N0-yAWlg_
zOmcZ{cui(QG*V(UT6$P{OG$7`QdweJHCRY_VK{knOk+|}M|UqY3jRYxW+h8XU-I!m
z#uQbJkwf6mX@9hH?~)6<(Y3bvEk3?#Ah`8;DsYnr^q11DfCKfhxhm2uCJ~+whTl`i
z*v|>8^oQbWV%mLSd&H|2@Wj{?6EKP-EAXBNvS=E9;}2q)Z9V+He37tf2sO9sx<+3t
z`_+O<#=6t!bpcT#A1gie0f*WH*za`PpE-ynkF}|pj(;4|-LRpOXi%Dz9#<~IuB50Y
z8b$&QqX<%~-8wfHx;>arLl!THOuOqRi^=U(D<=w><m+|6z{`wONoDka(;;s@f=$&@
zm;^WVdvDO1bUZobRi%U%;r=2?&AVBNC@&5K1KARUtX6{TKyBh8O}vME<~hDBxnhT5
zbGcu(VSi?)(GU&213Kuk`?H8Y@y6g|Ey|5fac2Zbsy!AqrMnw*r@(qanwOHSzibl+
z=4Ni_0|7^3k;$a>#0r#R8Ql9m`0a`)4Uw#-2z5s-o>f)qc<UZnBVb2fbK50{bG-Bg
zb)&iHyen#@G<LI|7JAne4ZpEZP9Rm!M*w)WyMOpQV8NiI58mWax)Cr!5k%>Sm>Z4r
zLt-n(D6K7>Btp+ypA)!(fVR0cpGw%TqSo{FTwYhE1z9fnIh0Pw7v4oAL!^&GV^d2O
zE!n&vXeE5HXelb=Eu<9|+~bD|d;Ej(H%JnHb3A96(QIUGb>NpRTBQ$Jw8>W)Ul>&q
zZhzy%oz%3qh2OyM;ih+04YjKdx6g2l$(Ddq#+fpD^Wwb%#Uw8(;xa_i|1UAylzr?N
zOXh6jlVC9~4(8F)g`-M}xz@)6|069d@kqz!S4An}$F=}YM<L(*@HKmW4>)HhcwBa~
z+nYN>euF$0{sg?K)x-^p_m3D$P2t(%BP)hOsM#U);CC1axSucxr2I#c9pJo|#VEeu
U@f_!yW4q?VEfNl$_-<5tx>kdyPyhe`

delta 958
zcmV;v13~=62hazQAb(RbFibgaV^d{RT2nG<XhlzGV`W)MM>BIUaxi#mH&$A1Pe(^&
zLU3+*MG9tVL}N2pa85FGMRHVkY)ENFNOCr1Z%$8Fb2K<rOl?|Wc2rDmGfQkSQ3@?S
zAXqXrH8D9LcWg>&HF9t>L}hPMaz|-RZ%R~pGfhluc~oLeWq&w1F*sOlK{aqza#uoY
z3M*DjD`jIjQ+7!-GG{qTF=H=vd1)(ZVnbwVLSb@RQ%Oy8P;+llHd9V_3N0-yAW=*(
zb5~|oOhZ&_T0}}sXj4W)VOU3IZF56qa7t`2D^zS{YgR8YRWL|R3ZlZK2}bFv@_d=3
zEx&E<`J|S0)PK7Ntr<95eWkw&vJgyp&I7Y3|HHP#|6V8m%RMpqdT#5yK$9!Z9EY(7
zL7bdLZ{~rtf#cOhWh?#PVwJ=a6DITs99hqO5tH#>4f=5I!7;_+^-&K$q@AeuQ8X6e
zYH}gmBh}*{%Clh+zY-c``)?~0ssZ~%cDLe8oQ_&<5P!zZqn^tfdWMx#Z&>L)a)g%g
z@>dQMl2?MN<wSfAgg`BWcl%BtQ%yRHs*B>I@lAE^%%*S5VH;BdNc2>^fD`Z9F<gLS
z!}WG)lRYLrtf3s9kP?-&MG=#q-aUE4o{I>j|H0=VGr!<)buUIElsl2~^Rw!`u3NGe
zFyM%20)GPAjej@<`Qoh5ZbkPb;kzb=0xF$@`^*6j@K{P$K(rIBiXc!xW#-M6n(}ME
z2*as4$Qfq$EH_fN9=aQktbj3Cdh6qdHASWQnN^N_$CmYrO)4wH^1bPozpvoF*r;5w
z^J_$6@$H09&PaXrZivl_+*HzuU1*6JF&~M&l7DwPK{?AFD97U?RR5#)WPth&GFbiH
zg6f&{{IL@XB+85K9~qbe^($4<Av8;@3h5+5VS@eGI9W*HR30`~d@#NWCPrdROfE4~
zrjccJ(DN$!^9^r52x3|)qFi~P!X4uJ12gE-xSPAc#JH%zHi@m|$easSUjBANf`Ma{
z6@LbHm2<Ursy{MniQbN?<F|u4S>E_C$KH;bp1HYhwpi`_!Yn;keWDjz`Ccb{J>xC8
z)zjgWsRw7H_p;ggKTl(4%aAAe%Bx1{vE$_s^27a<V~Fi0-76RurNp7N2PqZN?a6Gr
z0*ky{vD&CS(r)l;YlY@4no&C+HDK>FJvVPc>{T%4-G6c-RN5oWZ30)74eUg(B1gb!
gimC{FI7EhqwQI+rjqK59j^ApFYO)i1h!fD)@g}Fd%>V!Z