aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Joe Banks <[email protected]>2024-08-18 21:38:12 +0100
committerGravatar Joe Banks <[email protected]>2024-08-18 21:38:12 +0100
commit84483dcddf9ffad8c7a40d9188e340f2bcd0684d (patch)
tree51ddba28e9aeda945c6caecb8b67caafb1f2e596
parentAlphabetise DNS records (diff)
Thallium Backend to merch-api
-rw-r--r--dns/zones/pydis.wtf.zone/root.yaml2
-rw-r--r--kubernetes/namespaces/merch/ingress.yaml52
2 files changed, 27 insertions, 27 deletions
diff --git a/dns/zones/pydis.wtf.zone/root.yaml b/dns/zones/pydis.wtf.zone/root.yaml
index 1f1218b..a6c64d2 100644
--- a/dns/zones/pydis.wtf.zone/root.yaml
+++ b/dns/zones/pydis.wtf.zone/root.yaml
@@ -96,7 +96,7 @@ loki-gateway:
type: CNAME
value: linode-lb.box.pydis.wtf.
-merch:
+merch-api:
octodns:
cloudflare:
proxied: true
diff --git a/kubernetes/namespaces/merch/ingress.yaml b/kubernetes/namespaces/merch/ingress.yaml
index 1e74b96..81cf990 100644
--- a/kubernetes/namespaces/merch/ingress.yaml
+++ b/kubernetes/namespaces/merch/ingress.yaml
@@ -8,30 +8,30 @@ metadata:
namespace: merch
spec:
tls:
- - hosts:
- - "*.owlcorp.uk"
- secretName: owlcorp.uk-tls
- - hosts:
- - "*.pydis.wtf"
- secretName: pydis.wtf-tls
+ - hosts:
+ - "*.owlcorp.uk"
+ secretName: owlcorp.uk-tls
+ - hosts:
+ - "*.pydis.wtf"
+ secretName: pydis.wtf-tls
rules:
- - host: merch.owlcorp.uk
- http:
- paths:
- - path: /
- pathType: Prefix
- backend:
- service:
- name: thallium-backend-svc
- port:
- number: 80
- - host: merch.pydis.wtf
- http:
- paths:
- - path: /
- pathType: Prefix
- backend:
- service:
- name: thallium-backend-svc
- port:
- number: 80
+ - host: merch-api.owlcorp.uk
+ http:
+ paths:
+ - path: /
+ pathType: Prefix
+ backend:
+ service:
+ name: thallium-backend-svc
+ port:
+ number: 80
+ - host: merch-api.pydis.wtf
+ http:
+ paths:
+ - path: /
+ pathType: Prefix
+ backend:
+ service:
+ name: thallium-backend-svc
+ port:
+ number: 80