From dae01a2a39dcd7c793a8c1128606bd4b2977eaf5 Mon Sep 17 00:00:00 2001
From: Leo Lapworth <leo@cuckoo.org>
Date: Sun, 11 Aug 2024 14:11:24 +0100
Subject: [PATCH] More stuff until it works!

---
 apps/test-smoke/base/deployment.yaml          |  7 ------
 apps/test-smoke/base/service.yaml             |  4 ++--
 .../test-smoke/environments/prod/ingress.yaml | 23 +++++++++++++++----
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/apps/test-smoke/base/deployment.yaml b/apps/test-smoke/base/deployment.yaml
index 2a0ffaa..6a49107 100644
--- a/apps/test-smoke/base/deployment.yaml
+++ b/apps/test-smoke/base/deployment.yaml
@@ -41,13 +41,6 @@ spec:
         app: testsmoke-api
     spec:
       containers:
-        - name: web
-          image: metacpan/perl5-coresmokedb-api:latest
-          imagePullPolicy: Always
-          # command: [ "/uwsgi.sh" ]
-          # args: [ "--http-socket", ":5001" ]
-          ports:
-            - containerPort: 5555
         - name: api
           image: metacpan/perl5-coresmokedb-api:latest
           imagePullPolicy: Always
diff --git a/apps/test-smoke/base/service.yaml b/apps/test-smoke/base/service.yaml
index 250b91d..eb9ff1f 100644
--- a/apps/test-smoke/base/service.yaml
+++ b/apps/test-smoke/base/service.yaml
@@ -7,7 +7,7 @@ spec:
     - port: 80
       targetPort: 5555
   selector:
-    app: web
+    app: testsmoke-web
 ---
 apiVersion: v1    
 kind: Service
@@ -18,4 +18,4 @@ spec:
     - port: 80
       targetPort: 5050
   selector:
-    app: api
\ No newline at end of file
+    app: testsmoke-api
\ No newline at end of file
diff --git a/apps/test-smoke/environments/prod/ingress.yaml b/apps/test-smoke/environments/prod/ingress.yaml
index 04b225e..86a417c 100644
--- a/apps/test-smoke/environments/prod/ingress.yaml
+++ b/apps/test-smoke/environments/prod/ingress.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: testsmoke
+  name: testsmoke-web
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-production
 spec:
@@ -9,7 +9,6 @@ spec:
   tls:
     - hosts:
         - testsmoke-web.do.metacpan.org
-        - testsmoke-api.do.metacpan.org
       secretName: web-tls
   rules:
     - host: testsmoke-web.do.metacpan.org
@@ -19,17 +18,31 @@ spec:
             path: "/"
             backend:
               service:
-                name: web
+                name: testsmoke-web
                 port:
                   number: 80
-    - host: testsmoke-api.metacpan.org
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: testsmoke-api
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-production
+spec:
+  ingressClassName: nginx
+  tls:
+    - hosts:
+        - testsmoke-api.do.metacpan.org
+      secretName: api-tls
+  rules:
+    - host: testsmoke-api.do.metacpan.org
       http:
         paths:
           - pathType: Prefix
             path: "/"
             backend:
               service:
-                name: api
+                name: testsmoke-api
                 port:
                   number: 80