From 6db173d79b2a66bc8cc30cf4e3a94feb445b983e Mon Sep 17 00:00:00 2001
From: "ryan-distrust.co" <ryan@distrust.co>
Date: Wed, 1 Nov 2023 21:55:13 -0500
Subject: [PATCH] kustomizations/forgejo: bump to 1.20.5-0

---
 kustomizations/forgejo/app_template.ini              |  7 ++++++-
 kustomizations/forgejo/forgejo-ssh-keys.patch.yaml   |  2 +-
 kustomizations/forgejo/kustomization.yaml            |  4 ++--
 kustomizations/forgejo/resources.yaml                | 12 ++++++------
 .../forgejo/scripts/generate-forgejo-secret.sh       |  4 ++--
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/kustomizations/forgejo/app_template.ini b/kustomizations/forgejo/app_template.ini
index a3b0bb1..326febe 100644
--- a/kustomizations/forgejo/app_template.ini
+++ b/kustomizations/forgejo/app_template.ini
@@ -43,9 +43,11 @@ PATH = /data/gitea/attachments
 [log]
 MODE      = console
 LEVEL     = info
-ROUTER    = console
 ROOT_PATH = /data/gitea/log
 
+[log.router]
+MODE    = console
+
 [security]
 INSTALL_LOCK                  = true
 REVERSE_PROXY_LIMIT           = 1
@@ -75,6 +77,9 @@ ENABLE_OPENID_SIGNUP = false
 
 [oauth2]
 ENABLE = false
+# Ugly hack because Forgejo needs a key configured even if ENABLE = false
+JWT_SIGNING_ALGORITHM = HS256
+JWT_SECRET=3bjwLdq4ENukVe5ZL7ivrR_WiZwvD37iWcf5QU79NMA
 
 [oauth2_client]
 ENABLE_AUTO_REGISTRATION = true
diff --git a/kustomizations/forgejo/forgejo-ssh-keys.patch.yaml b/kustomizations/forgejo/forgejo-ssh-keys.patch.yaml
index 10db90e..ec41dfe 100644
--- a/kustomizations/forgejo/forgejo-ssh-keys.patch.yaml
+++ b/kustomizations/forgejo/forgejo-ssh-keys.patch.yaml
@@ -7,7 +7,7 @@ spec:
     spec:
       initContainers:
       - name: forgejo-ssh-key-prep
-        image: codeberg.org/forgejo/forgejo:1.19.3-0
+        image: codeberg.org/forgejo/forgejo:1.20.5-0
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
diff --git a/kustomizations/forgejo/kustomization.yaml b/kustomizations/forgejo/kustomization.yaml
index 77b29fd..683a8bf 100644
--- a/kustomizations/forgejo/kustomization.yaml
+++ b/kustomizations/forgejo/kustomization.yaml
@@ -33,5 +33,5 @@ configMapGenerator:
   files:
   - app_template.ini
 images:
-- name: codeberg.org/forgejo/forgejo:1.19.3-0
-  newTag: 1.19.3-0@sha256:e1e2a9930afe7e4e6c53b7d250072e5f890894da71df681510b6b513f38d0c36
+- name: codeberg.org/forgejo/forgejo:1.20.5-0
+  newTag: 1.20.5-0@sha256:d665129e66cc04fa72aa6a284eb98b17c0eee642aeaad7c88edec21f9edbf519
diff --git a/kustomizations/forgejo/resources.yaml b/kustomizations/forgejo/resources.yaml
index 298aa0b..8d079a5 100644
--- a/kustomizations/forgejo/resources.yaml
+++ b/kustomizations/forgejo/resources.yaml
@@ -43,7 +43,7 @@ spec:
           type: RuntimeDefault
       initContainers:
       - name: forgejo-ensure-directories
-        image: codeberg.org/forgejo/forgejo:1.19.3-0
+        image: codeberg.org/forgejo/forgejo:1.20.5-0
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
@@ -61,7 +61,7 @@ spec:
         - name: forgejo-data
           mountPath: /data
       - name: config-templater
-        image: codeberg.org/forgejo/forgejo:1.19.3-0
+        image: codeberg.org/forgejo/forgejo:1.20.5-0
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
@@ -79,7 +79,7 @@ spec:
         - name: forgejo-config
           mountPath: /output
       - name: forgejo-migrate
-        image: codeberg.org/forgejo/forgejo:1.19.3-0
+        image: codeberg.org/forgejo/forgejo:1.20.5-0
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
@@ -96,7 +96,7 @@ spec:
         - name: forgejo-config
           mountPath: /etc/forgejo
       - name: forgejo-oidc
-        image: codeberg.org/forgejo/forgejo:1.19.3-0
+        image: codeberg.org/forgejo/forgejo:1.20.5-0
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
@@ -120,7 +120,7 @@ spec:
           mountPath: /etc/forgejo
       containers:
       - name: forgejo-web
-        image: codeberg.org/forgejo/forgejo:1.19.3-0
+        image: codeberg.org/forgejo/forgejo:1.20.5-0
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
@@ -140,7 +140,7 @@ spec:
         - name: forgejo-config
           mountPath: /etc/forgejo
       - name: forgejo-ssh
-        image: codeberg.org/forgejo/forgejo:1.19.3-0
+        image: codeberg.org/forgejo/forgejo:1.20.5-0
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
diff --git a/kustomizations/forgejo/scripts/generate-forgejo-secret.sh b/kustomizations/forgejo/scripts/generate-forgejo-secret.sh
index 98ebda9..8773b19 100755
--- a/kustomizations/forgejo/scripts/generate-forgejo-secret.sh
+++ b/kustomizations/forgejo/scripts/generate-forgejo-secret.sh
@@ -8,8 +8,8 @@ if test -t 1; then
   exit 1
 fi
 
-FORGEJO_VERSION="1.19.3"
-FORGEJO_TAG="sha256:e1e2a9930afe7e4e6c53b7d250072e5f890894da71df681510b6b513f38d0c36"
+FORGEJO_VERSION="1.20.5-0"
+FORGEJO_TAG="sha256:d665129e66cc04fa72aa6a284eb98b17c0eee642aeaad7c88edec21f9edbf519"
 FORGEJO_SLUG="${FORGEJO_VERSION}@${FORGEJO_TAG}"
 
 forgejo() {