switch to new ingress

k8s/prod/ingress.yaml

@@ -1,46 +1,31 @@
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  annotations:
-    ingress.kubernetes.io/ssl-redirect: "true"
-  name: $DEPLOY
-spec:
-  tls:
-  - hosts:
-    - $DEPLOY.ducoterra.net
-    secretName: letsencrypt
-  rules:
-  - host: $DEPLOY.ducoterra.net
-    http:
-      paths:
-      - backend:
-          serviceName: $DEPLOY
-          servicePort: 8000
-
----
-
 apiVersion: traefik.containo.us/v1alpha1
 kind: IngressRoute
 metadata:
-  name: $DEPLOY-external-tls
+  name: $DEPLOY-internal-tls
+  annotations:
+    kubernetes.io/ingress.class: traefik-internal
 spec:
   entryPoints:
     - websecure
   tls:
-    secretName: letsencrypt
+    certResolver: myresolver
+    domains:
+    - main: "*.ducoterra.net"
   routes:
   - match: Host(`$DEPLOY.ducoterra.net`)
     kind: Rule
     services:
     - name: $DEPLOY
-      port: 8000
+      port: 80
 
 ---
 
 apiVersion: traefik.containo.us/v1alpha1
 kind: IngressRoute
 metadata:
-  name: $DEPLOY-external-web
+  name: $DEPLOY-internal-web
+  annotations:
+    kubernetes.io/ingress.class: traefik-internal
 spec:
   entryPoints:
     - web
@@ -49,6 +34,46 @@ spec:
     kind: Rule
     services:
     - name: $DEPLOY
-      port: 8000
+      port: 80
+    middlewares:
+      - name: httpsredirect
+
+---
+
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name: $DEPLOY-external-tls
+  annotations:
+    kubernetes.io/ingress.class: traefik-external
+spec:
+  entryPoints:
+    - websecure
+  tls:
+    certResolver: myresolver
+  routes:
+  - match: Host(`$DEPLOY.ducoterra.net`)
+    kind: Rule
+    services:
+    - name: $DEPLOY
+      port: 80
+
+---
+
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name: $DEPLOY-external-web
+  annotations:
+    kubernetes.io/ingress.class: traefik-external
+spec:
+  entryPoints:
+    - web
+  routes:
+  - match: Host(`$DEPLOY.ducoterra.net`)
+    kind: Rule
+    services:
+    - name: $DEPLOY
+      port: 80
     middlewares:
       - name: httpsredirect