mnml ingress

mnml/mnml.ingress.yaml

@@ -1,67 +1,12 @@
 ---
 # -----------------------------------------------------------------------
-# INGRESS
+# COMBINED INGRESS
 # -----------------------------------------------------------------------
 
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: mnml-client
+    name: mnml
-  namespace: mnml
-  annotations:
-    cert-manager.io/cluster-issuer: "letsencrypt-prod"
-spec:
-  ingressClassName: haproxy
-  tls:
-  - hosts:
-    - mnml.ntwl.xyz
-    secretName: mnml-tls
-  rules:
-  - host: mnml.ntwl.xyz
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: mnml-client
-            port:
-              number: 8080
-
----
-
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: mnml-api
-  namespace: mnml
-  annotations:
-    cert-manager.io/cluster-issuer: "letsencrypt-prod"
-    haproxy.org/websocket-support: "true"
-spec:
-  ingressClassName: haproxy
-  tls:
-  - hosts:
-    - mnml.ntwl.xyz
-    secretName: mnml-tls
-  rules:
-  - host: mnml.ntwl.xyz
-    http:
-      paths:
-      - path: /api
-        pathType: Prefix
-        backend:
-          service:
-            name: mnml-api
-            port:
-              number: 40000
-
----
-
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: mnml-ws
     namespace: mnml
     annotations:
         cert-manager.io/cluster-issuer: "letsencrypt-prod"
@@ -71,12 +16,26 @@ spec:
     ingressClassName: haproxy
     tls:
     - hosts:
-    - mnml.ntwl.xyz
+        - mnml.gg
       secretName: mnml-tls
     rules:
-  - host: mnml.ntwl.xyz
+    - host: mnml.gg
       http:
         paths:
+        - path: /
+          pathType: Prefix
+          backend:
+            service:
+              name: mnml-client
+              port:
+                number: 8080
+        - path: /api
+          pathType: Prefix
+          backend:
+            service:
+              name: mnml-api
+              port:
+                number: 40000
         - path: /api/ws
           pathType: Exact
           backend: