From 24cf6290fe553e79604877c03d84d54abf71c967 Mon Sep 17 00:00:00 2001
From: Chris Lovering <chris.lovering.95@gmail.com>
Date: Tue, 1 Oct 2024 16:52:10 +0100
Subject: [PATCH] Make thallium available on pythondiscord.com

---
 dns/zones/pythondiscord.com.yaml         |  8 ++++++++
 kubernetes/namespaces/merch/ingress.yaml | 13 +++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/dns/zones/pythondiscord.com.yaml b/dns/zones/pythondiscord.com.yaml
index 747be850..790e315e 100644
--- a/dns/zones/pythondiscord.com.yaml
+++ b/dns/zones/pythondiscord.com.yaml
@@ -132,6 +132,14 @@ lovelace._domainkey:
     - v=DKIM1\; h=sha256\; k=rsa\; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzOSIkdA12tPDmP7eDQqCEBWeg9J9qcpHsXueKmXHRUWxlPXmN9s08TcRtrrwuKvaGyn3zcj825/ZEa04EfQ7xkdeakHV41Oo79YRJahD9u75wyRqUbnTaTnZjW85LPW/1jr7zcXqtbMNwsfDA++6JfcUCm3TOKmFxjJDrZ5g62nMitTHLvhQ6MXkY1yD14lXC6G3/gX7wESTJlfep4vFkATdniypBC4bpqWJHxDDpdiRbB3UTzTPK6eMFUNVQBZ7RMqrWyRQBucEM+o+vTEez2VEyrLxkaPuQW3+m2OmJOeEDWf7qdVIb2t346bsjjgrToT4UBMw+VzEl3BwaOopowIDAQAB
 
 merch:
+  octodns:
+    cloudflare:
+      proxied: true
+  ttl: 300
+  type: CNAME
+  value: thallium.netlify.app.
+
+merch-api:
   octodns:
     cloudflare:
       proxied: true
diff --git a/kubernetes/namespaces/merch/ingress.yaml b/kubernetes/namespaces/merch/ingress.yaml
index 81cf990f..391c2872 100644
--- a/kubernetes/namespaces/merch/ingress.yaml
+++ b/kubernetes/namespaces/merch/ingress.yaml
@@ -14,6 +14,9 @@ spec:
     - hosts:
         - "*.pydis.wtf"
       secretName: pydis.wtf-tls
+    - hosts:
+        - "*.pythondiscord.com"
+      secretName: pythondiscord.com-tls
   rules:
     - host: merch-api.owlcorp.uk
       http:
@@ -35,3 +38,13 @@ spec:
                 name: thallium-backend-svc
                 port:
                   number: 80
+    - host: merch-api.pythondiscord.com
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: thallium-backend-svc
+                port:
+                  number: 80