From 84dc6ca20c2a468a98de529c9d0e6318d85cb55c Mon Sep 17 00:00:00 2001
From: Joakim Olsson <joakim@unbound.se>
Date: Wed, 29 Sep 2021 20:07:07 +0200
Subject: [PATCH] chore: prepare ingresses for K8S 1.22

---
 k8s/ingress-local.yaml |  9 ++++++---
 k8s/ingress-prod.yaml  | 32 +++++++++++++++-----------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/k8s/ingress-local.yaml b/k8s/ingress-local.yaml
index 573194c..93d9cb9 100644
--- a/k8s/ingress-local.yaml
+++ b/k8s/ingress-local.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: unbound-site-ingress
@@ -11,6 +11,9 @@ spec:
     http:
       paths:
       - path: /
+        pathType: Prefix
         backend:
-          serviceName: unbound-site
-          servicePort: 80
+          service:
+            name: unbound-site
+            port:
+              number: 80
diff --git a/k8s/ingress-prod.yaml b/k8s/ingress-prod.yaml
index ee87052..6bb9f36 100644
--- a/k8s/ingress-prod.yaml
+++ b/k8s/ingress-prod.yaml
@@ -1,35 +1,33 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: unbound-site-ingress
   annotations:
     kubernetes.io/ingress.class: "alb"
     alb.ingress.kubernetes.io/group.name: "unbound"
-    alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80},{"HTTPS": 443}]'
     alb.ingress.kubernetes.io/scheme: internet-facing
     alb.ingress.kubernetes.io/target-type: instance
-    alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
+    alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80},{"HTTPS": 443}]'
+    alb.ingress.kubernetes.io/ssl-redirect: "443"
 spec:
   rules:
     - host: "unbound.se"
       http:
         paths:
-          - path: /*
+          - path: /
+            pathType: Prefix
             backend:
-              serviceName: ssl-redirect
-              servicePort: use-annotation
-          - path: /*
-            backend:
-              serviceName: unbound-site
-              servicePort: 80
+              service:
+                name: unbound-site
+                port:
+                  number: 80
     - host: "www.unbound.se"
       http:
         paths:
-          - path: /*
+          - path: /
+            pathType: Prefix
             backend:
-              serviceName: ssl-redirect
-              servicePort: use-annotation
-          - path: /*
-            backend:
-              serviceName: unbound-site
-              servicePort: 80
+              service:
+                name: unbound-site
+                port:
+                  number: 80