Revert forgejo migration

This commit is contained in:
2025-02-16 13:47:33 +01:00
parent 83cc27014a
commit 2899f38fe6
16 changed files with 96 additions and 97 deletions

View File

@@ -1,29 +0,0 @@
# /apps/prod/forgejo/secret.enc.yaml
apiVersion: v1
kind: Secret
metadata:
name: forgejo-admin-secret
namespace: forgejo
stringData:
username: ENC[AES256_GCM,data:1K7hWGJC,iv:SRYfP1NLS633JKNORnsFkBFXo5sP4ejWNj6r4NXbrrQ=,tag:kOfUyxznR8p8VsiYy//Ytg==,type:str]
password: ENC[AES256_GCM,data:6GstZlME7jdHkwmyKCp+G72j6yk=,iv:sMunSzr6NZq5QVuibItDJq6n/KM5F9+Ulgc3XLdXuEg=,tag:+/2eBSEJMggo2X1Ft8RIlw==,type:str]
sops:
kms: []
gcp_kms: []
azure_kv: []
hc_vault: []
age:
- recipient: age1jk99rtxq3ep2xj2w886cchddf7jypqpwkr3dszg5dzq93gn8cy9qyc786m
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzQXVTa2hVaTAvbzU3aUxS
OHNUZm40RXlXa1dzRE5tMndKU015RVNYY1hjCjY5WDFYOFBrOXcyZm4vMkhWc0c4
UkhSYkhyVEJ2V1c1UytOZUxOTUJQWjgKLS0tIER2OFNsQUdHdkxTdEpObFFJcUxP
MVZUOGNJOC9QMU9WSWY2eTJjdEZsK2cKvdCXFw0LGc2Fqcnjla8SON0Oonsnrzfc
4GS1TFZ6bv4djodgn2wl43HmrrEvdHal2+HBDKv4McJv4x/jKBFbnw==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-09-24T17:35:23Z"
mac: ENC[AES256_GCM,data:MCbFvTfxsp1jEQngBp1dVZBHBagfogq4kUgpvHUG7xmzvSipicxnPdJe1bLdR/Ei8VWvU6O+PYn2jGBKxof8aYvEKUbMngq2fT26lhi/910pDMyEnp+HV4wJIdnIOwR3p8DMzw386ejlOxk+Q57/JvDoDuu1p7vWv9g+/6fxu2g=,iv:t8WGOMajR88BbW1M7NOigYnSFhZs+yW00Plq4dq57b0=,tag:Pvg6MdWhGslRTFI7XAseHw==,type:str]
pgp: []
unencrypted_regex: ^(apiVersion|metadata|kind|type)$
version: 3.9.0

View File

@@ -1,15 +1,15 @@
# /apps/prod/forgejo/ingress.yaml
# /apps/prod/gitea/ingress.yaml
apiVersion: traefik.io/v1alpha1
kind: IngressRoute
metadata:
name: forgejo-web-ingress
namespace: forgejo
name: gitea-web-ingress
namespace: gitea
spec:
entryPoints:
- websecure
routes:
- match: Host(`${FORGEJO_DOMAIN}`)
- match: Host(`${GITEA_DOMAIN}`)
kind: Rule
services:
- name: forgejo-http
- name: gitea-http
port: 3000

View File

@@ -1,17 +1,17 @@
# /apps/prod/forgejo/kustomization.yaml
# /apps/prod/gitea/kustomization.yaml
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: forgejo
namespace: gitea
resources:
- ../../base/forgejo
- ../../base/gitea
- secret.enc.yaml
- release.yaml
- ingress.yaml
configMapGenerator:
- name: forgejo-prod-values
namespace: forgejo
- name: gitea-prod-values
namespace: gitea
files:
- values.yaml

View File

@@ -1,4 +1,4 @@
# /apps/prod/authelia/kustomizeconfig.yaml
# /apps/prod/gitea/kustomizeconfig.yaml
nameReference:
- kind: ConfigMap
version: v1

View File

@@ -1,20 +1,20 @@
# /apps/prod/forgejo/release.yaml
# /apps/prod/gitea/release.yaml
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: forgejo
namespace: forgejo
name: gitea
namespace: gitea
spec:
interval: 1h
chart:
spec:
chart: forgejo
version: 11.0.1
chart: gitea
version: 10.6.0
sourceRef:
kind: HelmRepository
name: forgejo
namespace: forgejo
name: gitea
namespace: gitea
interval: 1h
valuesFrom:
- kind: ConfigMap
name: forgejo-prod-values
name: gitea-prod-values

View File

@@ -0,0 +1,29 @@
#ENC[AES256_GCM,data:qc0a9pEqZy+CSiZBSRDdqQIuvIZvI9xQwKtM2J1a6P2s,iv:TVeB+seBchMpuor8l1hxnj3Kv9FfADgL5G927Jtvk+0=,tag:PwNysdB1TlyIvVqtJW+ntw==,type:comment]
apiVersion: v1
kind: Secret
metadata:
name: gitea-admin-secret
namespace: gitea
stringData:
username: ENC[AES256_GCM,data:ZjFHZbQX,iv:ZeUFu0OpXuooA6ZoRCO4yUNi1PCB6H0FAI7+1c9YLGk=,tag:+QFpdQ/7MjxEuFkfkAHqBQ==,type:str]
password: ENC[AES256_GCM,data:lChzETDJOvaB97g2BCeLAW0+eWs=,iv:Pc20LS84UpQzz68bjauDAGmpPH2+pSfIUE/NXmmwlqI=,tag:ojI8smGTNp+GyaZMEB3UIA==,type:str]
sops:
kms: []
gcp_kms: []
azure_kv: []
hc_vault: []
age:
- recipient: age1jk99rtxq3ep2xj2w886cchddf7jypqpwkr3dszg5dzq93gn8cy9qyc786m
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMT1h2S1UyTlZDaHJTUFZU
MitnbEV4UHF0Q3B1QmhFMzZIQjBvUG90TTBjCkcrZ2ZISmdWK1JzMEVrOEVhdFlZ
SXJ0OGhMUG0rc1U2NHFaQkZxNnJMM2MKLS0tIEFRVDNNcVBjYnJYOFY3M1hlSXV3
aTF0R0RZUHZWNDNWU1dZb3IyVnBEcncKATaL5sPeFTk0lqjENM4y1xBp+h/uN8hH
pQLQkOAwytW5xcQQOLAiNW54KK6TyeUMDzYLP+4Eq6wnQM+gymFY9A==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2025-02-16T12:44:22Z"
mac: ENC[AES256_GCM,data:0gytbbuY/8FyHPKmLLSKPbEIfmrQXy/KtdvMVdun6VcHK+8csjOdPPYpoTo3FfbTbdl9LMbJ3Hs4L0hY8RZ9bV0xCcnE8MOIOyErfoS2MGQ3BdiBSbwBPN362VlQZCYqYri+8NMtbneGESSCM5yWNmd+68MZMr06pfU4m+bDxuo=,iv:9nboSOtS3/AMJT9xqgoqELpNyjS2S8FG/NLmt1Y74eI=,tag:1EyAZJ1Y4cuqCKBlaY8Msg==,type:str]
pgp: []
unencrypted_regex: ^(apiVersion|metadata|kind|type)$
version: 3.9.1

View File

@@ -1,4 +1,4 @@
# /apps/prod/forgejo/values.yaml
# /apps/prod/gitea/values.yaml
redis-cluster:
enabled: false
postgresql-ha:
@@ -23,8 +23,8 @@ image:
gitea:
admin:
existingSecret: forgejo-admin-secret
email: "${FORGEJO_ADMIN_EMAIL}"
existingSecret: gitea-admin-secret
email: "${GITEA_ADMIN_EMAIL}"
config:
actions:
ENABLED: true
@@ -40,8 +40,8 @@ gitea:
TYPE: channel
server:
BUILTIN_SSH_SERVER_USER: git
ROOT_URL: https://${FORGEJO_DOMAIN}
DOMAIN: ${FORGEJO_DOMAIN}
ROOT_URL: https://${GITEA_DOMAIN}
DOMAIN: ${GITEA_DOMAIN}
SSH_CREATE_AUTHORIZED_KEYS_FILE: false
LANDING_PAGE: explore
service:

View File

@@ -3,6 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- authelia
- forgejo
- gitea
- k9s-web
- lemma