From 5d2c0d85643e340be834d3f3e76642f03ac26024 Mon Sep 17 00:00:00 2001 From: tegwick Date: Wed, 21 Oct 2026 23:14:46 +0200 Subject: [PATCH] RAPPS-WP-0019 stage B: rename forge objects (forgejo-gitea-* -> forge-*) Local until the attended cutover; see the workplan for the scale-down order. Co-Authored-By: Claude Opus 5.5 Assistant: claude-code Assistant-Model: opus Assistant-Process: 276069@bnt-lap001 Assistant-Session: 2e192b3d-b3e8-4403-94d4-d55a2c8b476c --- ...ejo-runner-registration.sops.yaml.template | 2 +- helm/forgejo-values.yaml | 7 ++++++ manifests/forgejo-compat-http-service.yaml | 23 +++++++++++++++++++ manifests/forgejo-ingress.yaml | 6 ++--- manifests/forgejo-ssh-nodeport.yaml | 4 ++-- 5 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 manifests/forgejo-compat-http-service.yaml diff --git a/helm/forgejo-runner-registration.sops.yaml.template b/helm/forgejo-runner-registration.sops.yaml.template index 261f1bc..42ac5c3 100644 --- a/helm/forgejo-runner-registration.sops.yaml.template +++ b/helm/forgejo-runner-registration.sops.yaml.template @@ -2,7 +2,7 @@ # kubectl apply -f <(sops -d helm/forgejo-runner-registration.sops.yaml) # # Generate token (one-time, do not commit plaintext): -# kubectl exec -n forgejo deploy/forgejo-gitea -- \ +# kubectl exec -n forgejo deploy/forge -- \ # forgejo actions generate-runner-token --scope coulomb --- apiVersion: v1 diff --git a/helm/forgejo-values.yaml b/helm/forgejo-values.yaml index 08a219e..aeea98b 100644 --- a/helm/forgejo-values.yaml +++ b/helm/forgejo-values.yaml @@ -1,3 +1,9 @@ +# Product-neutral object names (RAPPS-WP-0019). The upstream chart is named +# 'gitea'; these overrides keep that legacy name out of live objects. The data +# volume keeps its existing claim name; renaming it needs a data copy. +fullnameOverride: forge +nameOverride: forge + # Non-secret Forgejo Helm values (gitea-charts/gitea chart + Forgejo image). # Layer helm/forgejo-secrets.sops.yaml for database password and admin credentials. # Recreate avoids leveldb queue lock fights on the shared RWO PVC during upgrades. @@ -29,6 +35,7 @@ image: persistence: enabled: true + claimName: gitea-shared-storage size: 10Gi postgresql: diff --git a/manifests/forgejo-compat-http-service.yaml b/manifests/forgejo-compat-http-service.yaml new file mode 100644 index 0000000..3600103 --- /dev/null +++ b/manifests/forgejo-compat-http-service.yaml @@ -0,0 +1,23 @@ +# TEMPORARY compatibility alias (RAPPS-WP-0019, stage B -> C). +# The forge Helm objects were renamed from forgejo-gitea-* to forge-*. In-cluster +# consumers still call http://forgejo-gitea-http.forgejo.svc:3000 until they move to +# forge-http (stage C). Delete this Service once no consumer uses the old name. +apiVersion: v1 +kind: Service +metadata: + name: forgejo-gitea-http + namespace: forgejo + labels: + app.kubernetes.io/instance: forgejo + app.kubernetes.io/part-of: railiance-apps + railiance.io/compat-alias-for: forge-http +spec: + clusterIP: None + selector: + app.kubernetes.io/instance: forgejo + app.kubernetes.io/name: forge + ports: + - name: http + port: 3000 + targetPort: 3000 + protocol: TCP diff --git a/manifests/forgejo-ingress.yaml b/manifests/forgejo-ingress.yaml index 8d2a52c..c92f126 100644 --- a/manifests/forgejo-ingress.yaml +++ b/manifests/forgejo-ingress.yaml @@ -22,21 +22,21 @@ spec: pathType: Prefix backend: service: - name: forgejo-gitea-http + name: forge-http port: number: 3000 - path: /v2 pathType: Prefix backend: service: - name: forgejo-gitea-http + name: forge-http port: number: 3000 - path: / pathType: Prefix backend: service: - name: forgejo-gitea-http + name: forge-http port: number: 3000 tls: diff --git a/manifests/forgejo-ssh-nodeport.yaml b/manifests/forgejo-ssh-nodeport.yaml index 42998e2..2f9b5ec 100644 --- a/manifests/forgejo-ssh-nodeport.yaml +++ b/manifests/forgejo-ssh-nodeport.yaml @@ -1,4 +1,4 @@ -# Git/SSH access for Forgejo (NodePort pattern mirrors coulombcore Gitea). +# Git/SSH NodePort for the forge (Forgejo). apiVersion: v1 kind: Service metadata: @@ -12,7 +12,7 @@ spec: type: NodePort selector: app.kubernetes.io/instance: forgejo - app.kubernetes.io/name: gitea + app.kubernetes.io/name: forge ports: - name: ssh port: 22