From 98d273ad32fc48258571b5759f2babd365269dd5 Mon Sep 17 00:00:00 2001 From: "Michal.Wrobel" Date: Mon, 14 Jul 2025 11:26:20 +0000 Subject: [PATCH 01/10] Update template/stacks/forgejo/forgejo-server/values.yaml --- template/stacks/forgejo/forgejo-server/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/forgejo/forgejo-server/values.yaml b/template/stacks/forgejo/forgejo-server/values.yaml index 9b4332c..ea3f206 100644 --- a/template/stacks/forgejo/forgejo-server/values.yaml +++ b/template/stacks/forgejo/forgejo-server/values.yaml @@ -163,7 +163,7 @@ image: #tag: "8.0.3" # Adds -rootless suffix to image name # rootless: true - fullOverride: forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/edp-forgejo:prerelease-v11-0-1-rootless + fullOverride: edp.buildth.ing/DevFW/-/packages/container/edp-forgejo/1.1.0 forgejo: runner: From 07e735d3292e86593b5c7d9a7db356d2b66a620b Mon Sep 17 00:00:00 2001 From: "Michal.Wrobel" Date: Mon, 14 Jul 2025 11:44:08 +0000 Subject: [PATCH 02/10] Update template/stacks/forgejo/forgejo-server/values.yaml --- template/stacks/forgejo/forgejo-server/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/forgejo/forgejo-server/values.yaml b/template/stacks/forgejo/forgejo-server/values.yaml index ea3f206..0ff54dc 100644 --- a/template/stacks/forgejo/forgejo-server/values.yaml +++ b/template/stacks/forgejo/forgejo-server/values.yaml @@ -163,7 +163,7 @@ image: #tag: "8.0.3" # Adds -rootless suffix to image name # rootless: true - fullOverride: edp.buildth.ing/DevFW/-/packages/container/edp-forgejo/1.1.0 + fullOverride: edp.buildth.ing/devfw/-/packages/container/edp-forgejo/1.1.0 forgejo: runner: From dec0bb413ff794637d84bef9c208c55a56be2098 Mon Sep 17 00:00:00 2001 From: "Michal.Wrobel" Date: Mon, 14 Jul 2025 11:51:39 +0000 Subject: [PATCH 03/10] Update template/stacks/forgejo/forgejo-server/values.yaml --- template/stacks/forgejo/forgejo-server/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/forgejo/forgejo-server/values.yaml b/template/stacks/forgejo/forgejo-server/values.yaml index 0ff54dc..b603fef 100644 --- a/template/stacks/forgejo/forgejo-server/values.yaml +++ b/template/stacks/forgejo/forgejo-server/values.yaml @@ -163,7 +163,7 @@ image: #tag: "8.0.3" # Adds -rootless suffix to image name # rootless: true - fullOverride: edp.buildth.ing/devfw/-/packages/container/edp-forgejo/1.1.0 + fullOverride: edp.buildth.ing/devfw/edp-forgejo:1.1.0 forgejo: runner: From 164a28075def87305dbdfa7d0f92c0c19b7e28a6 Mon Sep 17 00:00:00 2001 From: "Michal.Wrobel" Date: Mon, 14 Jul 2025 13:03:55 +0000 Subject: [PATCH 04/10] Update template/stacks/forgejo/forgejo-server/values.yaml --- template/stacks/forgejo/forgejo-server/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/forgejo/forgejo-server/values.yaml b/template/stacks/forgejo/forgejo-server/values.yaml index b603fef..2d2d4b3 100644 --- a/template/stacks/forgejo/forgejo-server/values.yaml +++ b/template/stacks/forgejo/forgejo-server/values.yaml @@ -163,7 +163,7 @@ image: #tag: "8.0.3" # Adds -rootless suffix to image name # rootless: true - fullOverride: edp.buildth.ing/devfw/edp-forgejo:1.1.0 + fullOverride: edp.buildth.ing/devfw-cicd/edp-forgejo:1.1.0 forgejo: runner: From 7d4414e756a0686cb15a16aaf4e03078158fee39 Mon Sep 17 00:00:00 2001 From: "Daniel.Sy" Date: Tue, 15 Jul 2025 13:53:42 +0000 Subject: [PATCH 05/10] feat(observability): Enabled metrics endpoint and scrape config for gitea Refs: DevFW/infra-deploy#92 --- template/stacks/forgejo/forgejo-server/values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/template/stacks/forgejo/forgejo-server/values.yaml b/template/stacks/forgejo/forgejo-server/values.yaml index 2d2d4b3..0918d43 100644 --- a/template/stacks/forgejo/forgejo-server/values.yaml +++ b/template/stacks/forgejo/forgejo-server/values.yaml @@ -39,6 +39,10 @@ extraVolumes: secretName: custom-database-certs gitea: + metrics: + enabled: true + serviceMonitor: + enabled: true additionalConfigFromEnvs: - name: FORGEJO__storage__MINIO_ACCESS_KEY_ID valueFrom: From 8c94137b5b7f39ffb5d64a7aab27653e7f62a67d Mon Sep 17 00:00:00 2001 From: Daniel Sy Date: Wed, 16 Jul 2025 10:42:00 +0200 Subject: [PATCH 06/10] =?UTF-8?q?feat(observability):=20=F0=9F=8E=89=20Add?= =?UTF-8?q?=20new=20VMRule=20for=20forgejo=20alerts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Introduces a new alerting rule for monitoring the forgejo application in the observability namespace. This rule triggers alerts when the forgejo server is down, helping to improve system reliability and response times. --- .../victoria-k8s-stack/manifests/alerts.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 template/stacks/observability/victoria-k8s-stack/manifests/alerts.yaml diff --git a/template/stacks/observability/victoria-k8s-stack/manifests/alerts.yaml b/template/stacks/observability/victoria-k8s-stack/manifests/alerts.yaml new file mode 100644 index 0000000..f884bd9 --- /dev/null +++ b/template/stacks/observability/victoria-k8s-stack/manifests/alerts.yaml @@ -0,0 +1,18 @@ +apiVersion: operator.victoriametrics.com/v1beta1 +kind: VMRule +metadata: + name: forgejo-alerts + namespace: observability +spec: + groups: + - name: forgejo + rules: + - alert: forgejo down + expr: sum by(cluster_environment) (up{pod=~"forgejo-server-.*"}) < 1 + for: 30s + labels: + severity: major + job: "{{ $labels.job }}" + annotations: + value: "{{ $value }}" + description: 'forgejo is down in cluster environment {{ $labels.cluster_environment }}' From 38e0765e3d2be17419b21104f890d343855bdb36 Mon Sep 17 00:00:00 2001 From: "franz.germann" Date: Thu, 17 Jul 2025 14:55:22 +0200 Subject: [PATCH 07/10] fix(elasticsearch): add toogle to omit elasticsearch --- template/stacks/forgejo/forgejo-server/values.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/template/stacks/forgejo/forgejo-server/values.yaml b/template/stacks/forgejo/forgejo-server/values.yaml index 0918d43..30367c6 100644 --- a/template/stacks/forgejo/forgejo-server/values.yaml +++ b/template/stacks/forgejo/forgejo-server/values.yaml @@ -94,6 +94,11 @@ gitea: secretKeyRef: name: elasticsearch-cloud-credentials key: connection-string + - name: FORGEJO__indexer__ISSUE_INDEXER_ENABLED + valueFrom: + secretKeyRef: + name: elasticsearch-cloud-credentials + key: enabled - name: FORGEJO__mailer__PASSWD valueFrom: secretKeyRef: @@ -107,7 +112,6 @@ gitea: APP_NAME: 'EDP' APP_SLOGAN: 'Build your thing in minutes' indexer: - ISSUE_INDEXER_ENABLED: true ISSUE_INDEXER_TYPE: elasticsearch # TODO next REPO_INDEXER_ENABLED: false From 0fae203a92456c3726ac8ad673f810defcc9f0ea Mon Sep 17 00:00:00 2001 From: Patrick Sy Date: Fri, 18 Jul 2025 11:19:09 +0200 Subject: [PATCH 08/10] fix: Point forgejo image to latest version on OSC --- template/stacks/forgejo/forgejo-server/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/forgejo/forgejo-server/values.yaml b/template/stacks/forgejo/forgejo-server/values.yaml index 30367c6..25beb87 100644 --- a/template/stacks/forgejo/forgejo-server/values.yaml +++ b/template/stacks/forgejo/forgejo-server/values.yaml @@ -171,7 +171,7 @@ image: #tag: "8.0.3" # Adds -rootless suffix to image name # rootless: true - fullOverride: edp.buildth.ing/devfw-cicd/edp-forgejo:1.1.0 + fullOverride: forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/edp-forgejo:v1.1.0-edp-v11.0.3 forgejo: runner: From 8000e3f8238c7ad2551511e21e6b1ca05a2c977c Mon Sep 17 00:00:00 2001 From: "Fritz-Leo.Ochsmann" Date: Fri, 18 Jul 2025 14:33:46 +0200 Subject: [PATCH 09/10] fix(forgejo): use bleve if elasticsearch is disabled --- template/stacks/forgejo/forgejo-server/values.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/template/stacks/forgejo/forgejo-server/values.yaml b/template/stacks/forgejo/forgejo-server/values.yaml index 25beb87..89de751 100644 --- a/template/stacks/forgejo/forgejo-server/values.yaml +++ b/template/stacks/forgejo/forgejo-server/values.yaml @@ -89,6 +89,12 @@ gitea: secretKeyRef: name: postgres-forgejo-cloud-credentials key: password + # Either 'elasticsearch' or 'bleve' (go in memory search engine) + - name: FORGEJO__indexer__ISSUE_INDEXER_TYPE + valueFrom: + secretKeyRef: + name: elasticsearch-cloud-credentials + key: type - name: FORGEJO__indexer__ISSUE_INDEXER_CONN_STR valueFrom: secretKeyRef: @@ -111,12 +117,6 @@ gitea: config: APP_NAME: 'EDP' APP_SLOGAN: 'Build your thing in minutes' - indexer: - ISSUE_INDEXER_TYPE: elasticsearch - # TODO next - REPO_INDEXER_ENABLED: false - # REPO_INDEXER_TYPE: meilisearch # not yet working - storage: MINIO_ENDPOINT: obs.eu-de.otc.t-systems.com:443 STORAGE_TYPE: minio From 2848e7d1cb761f2a16c3b121fa4c9376ab53f31f Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Mon, 21 Jul 2025 14:32:03 +0200 Subject: [PATCH 10/10] fix(forgejo): added prod/non-prod to s3 bucket --- template/stacks/forgejo/forgejo-server/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/forgejo/forgejo-server/values.yaml b/template/stacks/forgejo/forgejo-server/values.yaml index 89de751..e9a562c 100644 --- a/template/stacks/forgejo/forgejo-server/values.yaml +++ b/template/stacks/forgejo/forgejo-server/values.yaml @@ -121,7 +121,7 @@ gitea: MINIO_ENDPOINT: obs.eu-de.otc.t-systems.com:443 STORAGE_TYPE: minio MINIO_LOCATION: eu-de - MINIO_BUCKET: edp-forgejo-{{{ .Env.CLUSTER_ENVIRONMENT }}} + MINIO_BUCKET: {{{ .Env.FORGEJO_BUCKET_NAME }}} MINIO_USE_SSL: true queue: