diff --git a/kubernetes/deployment-production.tmpl b/kubernetes/deployment-production.tmpl index 2624137..b64e729 100644 --- a/kubernetes/deployment-production.tmpl +++ b/kubernetes/deployment-production.tmpl @@ -68,28 +68,18 @@ spec: port: 80 targetPort: 80 --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: - name: bajor-production-ingress - annotations: - kubernetes.io/ingress.class: nginx - cert-manager.io/cluster-issuer: letsencrypt-prod - nginx.ingress.kubernetes.io/proxy-buffer-size: "128k" - nginx.ingress.kubernetes.io/proxy-body-size: 20m + name: bajor-production-ingressroute spec: + entryPoints: + - websecure + routes: + - match: Host(`bajor.zooniverse.org`) + kind: Rule + services: + - name: bajor-production-app + port: 80 tls: - - hosts: - - bajor.zooniverse.org secretName: zooniverse-org-tls - rules: - - host: bajor.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: bajor-production-app - port: - number: 80 diff --git a/kubernetes/deployment-staging.tmpl b/kubernetes/deployment-staging.tmpl index 5448a5e..d58dda2 100644 --- a/kubernetes/deployment-staging.tmpl +++ b/kubernetes/deployment-staging.tmpl @@ -74,31 +74,21 @@ spec: port: 80 targetPort: 80 --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: - name: bajor-staging-ingress - annotations: - kubernetes.io/ingress.class: nginx - cert-manager.io/cluster-issuer: letsencrypt-prod - nginx.ingress.kubernetes.io/proxy-buffer-size: "128k" - nginx.ingress.kubernetes.io/proxy-body-size: 20m + name: bajor-production-ingressroute spec: + entryPoints: + - websecure + routes: + - match: Host(`bajor-staging.zooniverse.org`) + kind: Rule + services: + - name: bajor-staging-app + port: 80 tls: - - hosts: - - bajor-staging.zooniverse.org secretName: bajor-staging-tls-secret - rules: - - host: bajor-staging.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: bajor-staging-app - port: - number: 80 --- apiVersion: cert-manager.io/v1 kind: Certificate