diff --git a/k8s/ingress-local.yaml b/k8s/ingress-local.yaml index 32bea5f..f51f7df 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: dancefinder-ingress @@ -7,10 +7,13 @@ metadata: ingress.kubernetes.io/enable-cors: "true" spec: rules: - - host: "local-dancefinder.unbound.se" - http: - paths: - - path: /query - backend: - serviceName: dancefinder - servicePort: 80 + - host: "local-dancefinder.unbound.se" + http: + paths: + - path: /query + pathType: Exact + backend: + service: + name: dancefinder + port: + number: 80 diff --git a/k8s/ingress-prod.yaml b/k8s/ingress-prod.yaml index 1d79b9c..921725f 100644 --- a/k8s/ingress-prod.yaml +++ b/k8s/ingress-prod.yaml @@ -1,25 +1,23 @@ -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: dancefinder-ingress annotations: kubernetes.io/ingress.class: "alb" alb.ingress.kubernetes.io/group.name: "unbound" - alb.ingress.kubernetes.io/group.order: '10' - 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: "dancefinder.unbound.se" - http: - paths: - - path: /* - backend: - serviceName: ssl-redirect - servicePort: use-annotation - - path: /query - backend: - serviceName: dancefinder - servicePort: 80 + - host: "dancefinder.unbound.se" + http: + paths: + - path: /query + pathType: Exact + backend: + service: + name: dancefinder + port: + number: 80