diff --git a/k8s/ingress-local.yaml b/k8s/ingress-local.yaml index e10898e..606ef1a 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-app-ingress @@ -11,6 +11,9 @@ spec: http: paths: - path: / + pathType: Prefix backend: - serviceName: dancefinder-app - servicePort: 80 + service: + name: dancefinder-app + port: + number: 80 diff --git a/k8s/ingress-prod.yaml b/k8s/ingress-prod.yaml index c50d5fa..a0b5ee7 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-app-ingress annotations: kubernetes.io/ingress.class: "alb" alb.ingress.kubernetes.io/group.name: "unbound" - alb.ingress.kubernetes.io/group.order: '20' - 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: /* + - path: / + pathType: Prefix backend: - serviceName: ssl-redirect - servicePort: use-annotation - - path: /* - backend: - serviceName: dancefinder-app - servicePort: 80 + service: + name: dancefinder-app + port: + number: 80