Skip to content

Commit b4225f4

Browse files
committed
Migrate staging to traefik
1 parent 953bf99 commit b4225f4

4 files changed

Lines changed: 29 additions & 4 deletions

File tree

docker/deployment/base/next-proxy-deployment.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@ kind: Ingress
44
metadata:
55
name: languageforge-app
66
annotations:
7-
# https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/#custom-max-body-size
8-
# Added this to allow large file uploads, this setting should match the php custom config, i.e., upload_max_filesize, found in the app's customizations.php.ini
9-
nginx.ingress.kubernetes.io/proxy-body-size: 60M
7+
traefik.ingress.kubernetes.io/router.tls: "true"
108
spec:
9+
ingressClassName: traefik
1110
rules:
1211
- host: localhost
1312
http:
1413
paths:
1514
- path: /
16-
pathType: ImplementationSpecific
15+
pathType: Prefix
1716
backend:
1817
service:
1918
name: next-proxy
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Temporary patch: prod still runs on the (retired) community ingress-nginx
2+
# controller. The base manifest has been flipped to Traefik for the staging
3+
# cutover; this patch keeps prod on nginx until its own DNS cutover is
4+
# scheduled with LTOps. Delete this patch (and the kustomization entry that
5+
# references it) when prod migrates to Traefik.
6+
apiVersion: networking.k8s.io/v1
7+
kind: Ingress
8+
metadata:
9+
name: languageforge-app
10+
annotations:
11+
# https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/#custom-max-body-size
12+
# Added this to allow large file uploads, this setting should match the php custom config, i.e., upload_max_filesize, found in the app's customizations.php.ini
13+
nginx.ingress.kubernetes.io/proxy-body-size: 60M
14+
# Strip the Traefik router annotation inherited from base; prod is still on nginx.
15+
traefik.ingress.kubernetes.io/router.tls: null
16+
spec:
17+
ingressClassName: nginx

docker/deployment/prod/ingress-config-patch.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,9 @@
77
path: /spec/tls/0/hosts
88
value:
99
- languageforge.org
10+
# Revert base's pathType change until prod migrates from ingress-nginx to Traefik.
11+
# This apparently isn't necessary, but I'm being conservative.
12+
# Remove this op when prod migrates.
13+
- op: replace
14+
path: /spec/rules/0/http/paths/0/pathType
15+
value: ImplementationSpecific

docker/deployment/prod/kustomization.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,6 @@ patches:
2828
kind: Ingress
2929
name: languageforge-app
3030
namespace: languageforge
31+
# Keep prod on the community ingress-nginx controller until its DNS cutover
32+
# to Traefik is scheduled. Remove this once prod migrates.
33+
- path: ingress-class-revert-patch.yaml

0 commit comments

Comments
 (0)