diff --git a/kubernetes/ingress/ancientlives.org.yaml b/kubernetes/ingress/ancientlives.org.yaml index e3f9317..b07f94c 100644 --- a/kubernetes/ingress/ancientlives.org.yaml +++ b/kubernetes/ingress/ancientlives.org.yaml @@ -13,39 +13,18 @@ spec: - ancientlives.org - "*.ancientlives.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: ancientlives.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`ancientlives.org`) || HostRegexp(`^.+\.ancientlives\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - ancientlives.org - - "*.ancientlives.org" secretName: ancientlives-org-tls - rules: - - host: ancientlives.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.ancientlives.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/andromedaproject.org.yaml b/kubernetes/ingress/andromedaproject.org.yaml index 3b0ac8b..62d4e40 100644 --- a/kubernetes/ingress/andromedaproject.org.yaml +++ b/kubernetes/ingress/andromedaproject.org.yaml @@ -13,39 +13,18 @@ spec: - andromedaproject.org - "*.andromedaproject.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: andromedaproject.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`andromedaproject.org`) || HostRegexp(`^.+\.andromedaproject\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - andromedaproject.org - - "*.andromedaproject.org" secretName: andromedaproject-org-tls - rules: - - host: andromedaproject.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.andromedaproject.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/antislaverymanuscripts.org.yaml b/kubernetes/ingress/antislaverymanuscripts.org.yaml index c4bac0c..fe70e83 100644 --- a/kubernetes/ingress/antislaverymanuscripts.org.yaml +++ b/kubernetes/ingress/antislaverymanuscripts.org.yaml @@ -13,39 +13,18 @@ spec: - antislaverymanuscripts.org - "*.antislaverymanuscripts.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: antislaverymanuscripts.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`antislaverymanuscripts.org`) || HostRegexp(`^.+\.antislaverymanuscripts\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - antislaverymanuscripts.org - - "*.antislaverymanuscripts.org" secretName: antislaverymanuscripts-org-tls - rules: - - host: antislaverymanuscripts.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.antislaverymanuscripts.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/arizonabatwatch.org.yaml b/kubernetes/ingress/arizonabatwatch.org.yaml index 769ed46..61798af 100644 --- a/kubernetes/ingress/arizonabatwatch.org.yaml +++ b/kubernetes/ingress/arizonabatwatch.org.yaml @@ -13,39 +13,18 @@ spec: - arizonabatwatch.org - "*.arizonabatwatch.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: arizonabatwatch.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`arizonabatwatch.org`) || HostRegexp(`^.+\.arizonabatwatch\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - arizonabatwatch.org - - "*.arizonabatwatch.org" secretName: arizonabatwatch-org-tls - rules: - - host: arizonabatwatch.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.arizonabatwatch.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/asteroidzoo.org.uk.yaml b/kubernetes/ingress/asteroidzoo.org.uk.yaml index 1d4262b..9c40b7f 100644 --- a/kubernetes/ingress/asteroidzoo.org.uk.yaml +++ b/kubernetes/ingress/asteroidzoo.org.uk.yaml @@ -13,39 +13,18 @@ spec: - asteroidzoo.org.uk - "*.asteroidzoo.org.uk" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: asteroidzoo.org.uk - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`asteroidzoo.org.uk`) || HostRegexp(`^.+\.asteroidzoo\.org\.uk$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - asteroidzoo.org.uk - - "*.asteroidzoo.org.uk" secretName: asteroidzoo-org-uk-tls - rules: - - host: asteroidzoo.org.uk - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.asteroidzoo.org.uk" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/asteroidzoo.org.yaml b/kubernetes/ingress/asteroidzoo.org.yaml index eef30fe..4cc8880 100644 --- a/kubernetes/ingress/asteroidzoo.org.yaml +++ b/kubernetes/ingress/asteroidzoo.org.yaml @@ -13,39 +13,18 @@ spec: - asteroidzoo.org - "*.asteroidzoo.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: asteroidzoo.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`asteroidzoo.org`) || HostRegexp(`^.+\.asteroidzoo\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - asteroidzoo.org - - "*.asteroidzoo.org" secretName: asteroidzoo-org-tls - rules: - - host: asteroidzoo.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.asteroidzoo.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/astronomyrewind.org.yaml b/kubernetes/ingress/astronomyrewind.org.yaml index b40630d..14c0032 100644 --- a/kubernetes/ingress/astronomyrewind.org.yaml +++ b/kubernetes/ingress/astronomyrewind.org.yaml @@ -13,39 +13,18 @@ spec: - astronomyrewind.org - "*.astronomyrewind.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: astronomyrewind.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`astronomyrewind.org`) || HostRegexp(`^.+\.astronomyrewind\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - astronomyrewind.org - - "*.astronomyrewind.org" secretName: astronomyrewind-org-tls - rules: - - host: astronomyrewind.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.astronomyrewind.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/backyardworlds_org.yaml b/kubernetes/ingress/backyardworlds_org.yaml index 37bc002..c14ff25 100644 --- a/kubernetes/ingress/backyardworlds_org.yaml +++ b/kubernetes/ingress/backyardworlds_org.yaml @@ -13,39 +13,18 @@ spec: - backyardworlds.org - "*.backyardworlds.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: backyardworlds.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`backyardworlds.org`) || HostRegexp(`^.+\.backyardworlds\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - backyardworlds.org - - "*.backyardworlds.org" secretName: backyardworlds-org-tls - rules: - - host: backyardworlds.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.backyardworlds.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/batdetective.org.yaml b/kubernetes/ingress/batdetective.org.yaml index 3f6cb96..d111529 100644 --- a/kubernetes/ingress/batdetective.org.yaml +++ b/kubernetes/ingress/batdetective.org.yaml @@ -13,39 +13,18 @@ spec: - batdetective.org - "*.batdetective.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: batdetective.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`batdetective.org`) || HostRegexp(`^.+\.batdetective\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - batdetective.org - - "*.batdetective.org" secretName: batdetective-org-tls - rules: - - host: batdetective.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.batdetective.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/cellslider.net.yaml b/kubernetes/ingress/cellslider.net.yaml index 4be2580..70a72cf 100644 --- a/kubernetes/ingress/cellslider.net.yaml +++ b/kubernetes/ingress/cellslider.net.yaml @@ -13,39 +13,18 @@ spec: - cellslider.net - "*.cellslider.net" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: cellslider.net - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`cellslider.net`) || HostRegexp(`^.+\.cellslider\.net$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - cellslider.net - - "*.cellslider.net" secretName: cellslider-net-tls - rules: - - host: cellslider.net - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.cellslider.net" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/chicagowildlifewatch.org.yaml b/kubernetes/ingress/chicagowildlifewatch.org.yaml index 8b4c9af..1eb0d71 100644 --- a/kubernetes/ingress/chicagowildlifewatch.org.yaml +++ b/kubernetes/ingress/chicagowildlifewatch.org.yaml @@ -13,39 +13,18 @@ spec: - chicagowildlifewatch.org - "*.chicagowildlifewatch.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: chicagowildlifewatch.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`chicagowildlifewatch.org`) || HostRegexp(`^.+\.chicagowildlifewatch\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - chicagowildlifewatch.org - - "*.chicagowildlifewatch.org" secretName: chicagowildlifewatch-org-tls - rules: - - host: chicagowildlifewatch.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.chicagowildlifewatch.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/chimpandsee.org.yaml b/kubernetes/ingress/chimpandsee.org.yaml index 22037cb..46f0263 100644 --- a/kubernetes/ingress/chimpandsee.org.yaml +++ b/kubernetes/ingress/chimpandsee.org.yaml @@ -13,39 +13,18 @@ spec: - chimpandsee.org - "*.chimpandsee.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: chimpandsee.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`chimpandsee.org`) || HostRegexp(`^.+\.chimpandsee\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - chimpandsee.org - - "*.chimpandsee.org" secretName: chimpandsee-org-tls - rules: - - host: chimpandsee.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.chimpandsee.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/citizensciencealliance.org.yaml b/kubernetes/ingress/citizensciencealliance.org.yaml index a234278..d74bcd0 100644 --- a/kubernetes/ingress/citizensciencealliance.org.yaml +++ b/kubernetes/ingress/citizensciencealliance.org.yaml @@ -13,39 +13,18 @@ spec: - citizensciencealliance.org - "*.citizensciencealliance.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: citizensciencealliance.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`citizensciencealliance.org`) || HostRegexp(`^.+\.citizensciencealliance\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - citizensciencealliance.org - - "*.citizensciencealliance.org" secretName: citizensciencealliance-org-tls - rules: - - host: citizensciencealliance.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.citizensciencealliance.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/citizensciencetoday.org.yaml b/kubernetes/ingress/citizensciencetoday.org.yaml deleted file mode 100644 index d4e5c89..0000000 --- a/kubernetes/ingress/citizensciencetoday.org.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: citizensciencetoday-org-tls -spec: - issuerRef: - name: letsencrypt-prod - kind: ClusterIssuer - secretName: citizensciencetoday-org-tls - dnsNames: - - www.citizensciencetoday.org ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: citizensciencetoday.org - 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/set-real-ip-from: "10.0.0.0/8" -spec: - tls: - - hosts: - - www.citizensciencetoday.org - secretName: citizensciencetoday-org-tls - rules: - - host: www.citizensciencetoday.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/clicktocure.net.yaml b/kubernetes/ingress/clicktocure.net.yaml index a3e10d8..47faeeb 100644 --- a/kubernetes/ingress/clicktocure.net.yaml +++ b/kubernetes/ingress/clicktocure.net.yaml @@ -13,39 +13,18 @@ spec: - clicktocure.net - "*.clicktocure.net" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: clicktocure.net - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`clicktocure.net`) || HostRegexp(`^.+\.clicktocure\.net$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - clicktocure.net - - "*.clicktocure.net" secretName: clicktocure-net-tls - rules: - - host: clicktocure.net - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.clicktocure.net" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/condorwatch.org.yaml b/kubernetes/ingress/condorwatch.org.yaml index f1dc321..e586b78 100644 --- a/kubernetes/ingress/condorwatch.org.yaml +++ b/kubernetes/ingress/condorwatch.org.yaml @@ -13,39 +13,18 @@ spec: - condorwatch.org - "*.condorwatch.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: - name: condorwatch-org - 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/set-real-ip-from: "10.0.0.0/8" + name: condorwatch.org spec: + entryPoints: + - websecure + routes: + - match: Host(`condorwatch.org`) || HostRegexp(`^.+\.condorwatch\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - condorwatch.org - - "*.condorwatch.org" secretName: condorwatch-org-tls - rules: - - host: condorwatch.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.condorwatch.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/conversationsonnature.com.yaml b/kubernetes/ingress/conversationsonnature.com.yaml deleted file mode 100644 index 059829f..0000000 --- a/kubernetes/ingress/conversationsonnature.com.yaml +++ /dev/null @@ -1,51 +0,0 @@ -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: conversationsonnature-com-tls - labels: - use-azuredns-solver: "true" -spec: - issuerRef: - name: letsencrypt-prod - kind: ClusterIssuer - secretName: conversationsonnature-com-tls - dnsNames: - - conversationsonnature.com - - "*.conversationsonnature.com" ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: conversationsonnature.com - 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/set-real-ip-from: "10.0.0.0/8" -spec: - tls: - - hosts: - - conversationsonnature.com - - "*.conversationsonnature.com" - secretName: conversationsonnature-com-tls - rules: - - host: conversationsonnature.com - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.conversationsonnature.com" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/cyclonecenter.org.yaml b/kubernetes/ingress/cyclonecenter.org.yaml index 84073c0..f0327e0 100644 --- a/kubernetes/ingress/cyclonecenter.org.yaml +++ b/kubernetes/ingress/cyclonecenter.org.yaml @@ -13,39 +13,18 @@ spec: - cyclonecenter.org - "*.cyclonecenter.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: cyclonecenter.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`cyclonecenter.org`) || HostRegexp(`^.+\.cyclonecenter\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - cyclonecenter.org - - "*.cyclonecenter.org" secretName: cyclonecenter-org-tls - rules: - - host: cyclonecenter.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.cyclonecenter.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/cyclonecentre.org.yaml b/kubernetes/ingress/cyclonecentre.org.yaml index 077641e..8bd408a 100644 --- a/kubernetes/ingress/cyclonecentre.org.yaml +++ b/kubernetes/ingress/cyclonecentre.org.yaml @@ -13,39 +13,18 @@ spec: - cyclonecentre.org - "*.cyclonecentre.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: cyclonecentre.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`cyclonecentre.org`) || HostRegexp(`^.+\.cyclonecentre\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - cyclonecentre.org - - "*.cyclonecentre.org" secretName: cyclonecentre-org-tls - rules: - - host: cyclonecentre.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.cyclonecentre.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/decodingthecivilwar.org.yaml b/kubernetes/ingress/decodingthecivilwar.org.yaml index a084b35..91d84ae 100644 --- a/kubernetes/ingress/decodingthecivilwar.org.yaml +++ b/kubernetes/ingress/decodingthecivilwar.org.yaml @@ -13,39 +13,18 @@ spec: - decodingthecivilwar.org - "*.decodingthecivilwar.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: decodingthecivilwar.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`decodingthecivilwar.org`) || HostRegexp(`^.+\.decodingthecivilwar\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - decodingthecivilwar.org - - "*.decodingthecivilwar.org" secretName: decodingthecivilwar-org-tls - rules: - - host: decodingthecivilwar.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.decodingthecivilwar.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/diagnosislondon.org.yaml b/kubernetes/ingress/diagnosislondon.org.yaml deleted file mode 100644 index ed1ed97..0000000 --- a/kubernetes/ingress/diagnosislondon.org.yaml +++ /dev/null @@ -1,51 +0,0 @@ -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: diagnosislondon-org-tls - labels: - use-azuredns-solver: "true" -spec: - issuerRef: - name: letsencrypt-prod - kind: ClusterIssuer - secretName: diagnosislondon-org-tls - dnsNames: - - diagnosislondon.org - - "*.diagnosislondon.org" ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: diagnosislondon.org - 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/set-real-ip-from: "10.0.0.0/8" -spec: - tls: - - hosts: - - diagnosislondon.org - - "*.diagnosislondon.org" - secretName: diagnosislondon-org-tls - rules: - - host: diagnosislondon.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.diagnosislondon.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/diskdetective.org.yaml b/kubernetes/ingress/diskdetective.org.yaml index d2ad192..df885d4 100644 --- a/kubernetes/ingress/diskdetective.org.yaml +++ b/kubernetes/ingress/diskdetective.org.yaml @@ -13,39 +13,18 @@ spec: - diskdetective.org - "*.diskdetective.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: diskdetective.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`diskdetective.org`) || HostRegexp(`^.+\.diskdetective\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - diskdetective.org - - "*.diskdetective.org" secretName: diskdetective-org-tls - rules: - - host: diskdetective.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.diskdetective.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/exoplanetexplorers.org.yaml b/kubernetes/ingress/exoplanetexplorers.org.yaml index 20b5f5e..72f2432 100644 --- a/kubernetes/ingress/exoplanetexplorers.org.yaml +++ b/kubernetes/ingress/exoplanetexplorers.org.yaml @@ -13,39 +13,18 @@ spec: - exoplanetexplorers.org - "*.exoplanetexplorers.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: exoplanetexplorers.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`exoplanetexplorers.org`) || HostRegexp(`^.+\.exoplanetexplorers\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - exoplanetexplorers.org - - "*.exoplanetexplorers.org" secretName: exoplanetexplorers-org-tls - rules: - - host: exoplanetexplorers.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.exoplanetexplorers.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/fallback.yaml b/kubernetes/ingress/fallback.yaml index 19d796d..3a3d21b 100644 --- a/kubernetes/ingress/fallback.yaml +++ b/kubernetes/ingress/fallback.yaml @@ -1,19 +1,16 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: frontend-fallback - annotations: - kubernetes.io/ingress.class: nginx - nginx.ingress.kubernetes.io/proxy-buffer-size: "128k" - nginx.ingress.kubernetes.io/set-real-ip-from: "10.0.0.0/8" spec: - rules: - - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 + entryPoints: + - websecure + - web # Included so it catches standard HTTP port 80 garbage/scanners too + routes: + - match: PathPrefix(`/`) + kind: Rule + priority: 1 # Forces this to be evaluated last + services: + - name: http-frontend + port: 80 + # No cert defined, nonmatched hosts will use Traefik's self-signed cert diff --git a/kubernetes/ingress/floatingforests.org.yaml b/kubernetes/ingress/floatingforests.org.yaml index 5e45cd2..7e6ae10 100644 --- a/kubernetes/ingress/floatingforests.org.yaml +++ b/kubernetes/ingress/floatingforests.org.yaml @@ -13,39 +13,18 @@ spec: - floatingforests.org - "*.floatingforests.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: floatingforests.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`floatingforests.org`) || HostRegexp(`^.+\.floatingforests\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - floatingforests.org - - "*.floatingforests.org" secretName: floatingforests-org-tls - rules: - - host: floatingforests.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.floatingforests.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/galaxyzoo.org.yaml b/kubernetes/ingress/galaxyzoo.org.yaml index a7b3755..c671b6d 100644 --- a/kubernetes/ingress/galaxyzoo.org.yaml +++ b/kubernetes/ingress/galaxyzoo.org.yaml @@ -1,45 +1,5 @@ apiVersion: cert-manager.io/v1 kind: Certificate -metadata: - name: www-galaxyzoo-org-tls - labels: - use-azuredns-solver: "true" -spec: - issuerRef: - name: letsencrypt-prod - kind: ClusterIssuer - secretName: www-galaxyzoo-org-tls - dnsNames: - - www.galaxyzoo.org ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: www.galaxyzoo.org - annotations: - kubernetes.io/ingress.class: nginx - certmanager.k8s.io/cluster-issuer: letsencrypt-prod - nginx.ingress.kubernetes.io/proxy-buffer-size: "128k" - nginx.ingress.kubernetes.io/set-real-ip-from: "10.0.0.0/8" -spec: - tls: - - hosts: - - www.galaxyzoo.org - secretName: www-galaxyzoo-org-tls - rules: - - host: www.galaxyzoo.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 ---- -apiVersion: cert-manager.io/v1 -kind: Certificate metadata: name: galaxyzoo-org-tls labels: @@ -53,39 +13,18 @@ spec: - galaxyzoo.org - "*.galaxyzoo.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: galaxyzoo.org - annotations: - kubernetes.io/ingress.class: nginx - certmanager.k8s.io/cluster-issuer: letsencrypt-prod - nginx.ingress.kubernetes.io/proxy-buffer-size: "128k" - nginx.ingress.kubernetes.io/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`galaxyzoo.org`) || HostRegexp(`^.+\.galaxyzoo\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - galaxyzoo.org - - "*.galaxyzoo.org" secretName: galaxyzoo-org-tls - rules: - - host: galaxyzoo.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.galaxyzoo.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/galaxyzooblog.org.yaml b/kubernetes/ingress/galaxyzooblog.org.yaml index 542f44d..32bbe18 100644 --- a/kubernetes/ingress/galaxyzooblog.org.yaml +++ b/kubernetes/ingress/galaxyzooblog.org.yaml @@ -13,39 +13,18 @@ spec: - galaxyzooblog.org - "*.galaxyzooblog.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: galaxyzooblog.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`galaxyzooblog.org`) || HostRegexp(`^.+\.galaxyzooblog\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - galaxyzooblog.org - - "*.galaxyzooblog.org" secretName: galaxyzooblog-org-tls - rules: - - host: galaxyzooblog.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.galaxyzooblog.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/galaxyzooforum.org.yaml b/kubernetes/ingress/galaxyzooforum.org.yaml index 6cdffa9..37fb5f7 100644 --- a/kubernetes/ingress/galaxyzooforum.org.yaml +++ b/kubernetes/ingress/galaxyzooforum.org.yaml @@ -13,39 +13,18 @@ spec: - galaxyzooforum.org - "*.galaxyzooforum.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: galaxyzooforum.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`galaxyzooforum.org`) || HostRegexp(`^.+\.galaxyzooforum\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - galaxyzooforum.org - - "*.galaxyzooforum.org" secretName: galaxyzooforum-org-tls - rules: - - host: galaxyzooforum.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.galaxyzooforum.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/gravityspy.org.yaml b/kubernetes/ingress/gravityspy.org.yaml index d18ce4d..742918a 100644 --- a/kubernetes/ingress/gravityspy.org.yaml +++ b/kubernetes/ingress/gravityspy.org.yaml @@ -13,39 +13,18 @@ spec: - gravityspy.org - "*.gravityspy.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: gravityspy.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`gravityspy.org`) || HostRegexp(`^.+\.gravityspy\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - gravityspy.org - - "*.gravityspy.org" secretName: gravityspy-org-tls - rules: - - host: gravityspy.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.gravityspy.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/higgshunters.org.yaml b/kubernetes/ingress/higgshunters.org.yaml index f385a46..8304484 100644 --- a/kubernetes/ingress/higgshunters.org.yaml +++ b/kubernetes/ingress/higgshunters.org.yaml @@ -13,39 +13,18 @@ spec: - higgshunters.org - "*.higgshunters.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: higgshunters.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`higgshunters.org`) || HostRegexp(`^.+\.higgshunters\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - higgshunters.org - - "*.higgshunters.org" secretName: higgshunters-org-tls - rules: - - host: higgshunters.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.higgshunters.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/irishweatherrescue.ie.yaml b/kubernetes/ingress/irishweatherrescue.ie.yaml index a84e195..fae6432 100644 --- a/kubernetes/ingress/irishweatherrescue.ie.yaml +++ b/kubernetes/ingress/irishweatherrescue.ie.yaml @@ -13,39 +13,18 @@ spec: - irishweatherrescue.ie - "*.irishweatherrescue.ie" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: irishweatherrescue.ie - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`irishweatherrescue.ie`) || HostRegexp(`^.+\.irishweatherrescue\.ie$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - irishweatherrescue.ie - - "*.irishweatherrescue.ie" secretName: irishweatherrescue-ie-tls - rules: - - host: irishweatherrescue.ie - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.irishweatherrescue.ie" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/mappinghistoricskies.org.yaml b/kubernetes/ingress/mappinghistoricskies.org.yaml index 61aef2e..c0586ad 100644 --- a/kubernetes/ingress/mappinghistoricskies.org.yaml +++ b/kubernetes/ingress/mappinghistoricskies.org.yaml @@ -13,39 +13,18 @@ spec: - mappinghistoricskies.org - "*.mappinghistoricskies.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: mappinghistoricskies.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`mappinghistoricskies.org`) || HostRegexp(`^.+\.mappinghistoricskies\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - mappinghistoricskies.org - - "*.mappinghistoricskies.org" secretName: mappinghistoricskies-org-tls - rules: - - host: mappinghistoricskies.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.mappinghistoricskies.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/measuringtheanzacs.org.yaml b/kubernetes/ingress/measuringtheanzacs.org.yaml index 56355cf..346c162 100644 --- a/kubernetes/ingress/measuringtheanzacs.org.yaml +++ b/kubernetes/ingress/measuringtheanzacs.org.yaml @@ -13,39 +13,18 @@ spec: - measuringtheanzacs.org - "*.measuringtheanzacs.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: measuringtheanzacs.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`measuringtheanzacs.org`) || HostRegexp(`^.+\.measuringtheanzacs\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - measuringtheanzacs.org - - "*.measuringtheanzacs.org" secretName: measuringtheanzacs-org-tls - rules: - - host: measuringtheanzacs.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.measuringtheanzacs.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/microplants.org.yaml b/kubernetes/ingress/microplants.org.yaml index 144680d..003ce6e 100644 --- a/kubernetes/ingress/microplants.org.yaml +++ b/kubernetes/ingress/microplants.org.yaml @@ -13,39 +13,18 @@ spec: - microplants.org - "*.microplants.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: microplants.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`microplants.org`) || HostRegexp(`^.+\.microplants\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - microplants.org - - "*.microplants.org" secretName: microplants-org-tls - rules: - - host: microplants.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.microplants.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/milkywayproject.org.yaml b/kubernetes/ingress/milkywayproject.org.yaml index 021cf54..7276f99 100644 --- a/kubernetes/ingress/milkywayproject.org.yaml +++ b/kubernetes/ingress/milkywayproject.org.yaml @@ -13,39 +13,18 @@ spec: - milkywayproject.org - "*.milkywayproject.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: milkywayproject.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`milkywayproject.org`) || HostRegexp(`^.+\.milkywayproject\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - milkywayproject.org - - "*.milkywayproject.org" secretName: milkywayproject-org-tls - rules: - - host: milkywayproject.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.milkywayproject.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/moonzoo.org.yaml b/kubernetes/ingress/moonzoo.org.yaml index 5da56f4..467734e 100644 --- a/kubernetes/ingress/moonzoo.org.yaml +++ b/kubernetes/ingress/moonzoo.org.yaml @@ -13,39 +13,18 @@ spec: - moonzoo.org - "*.moonzoo.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: moonzoo.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`moonzoo.org`) || HostRegexp(`^.+\.moonzoo\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - moonzoo.org - - "*.moonzoo.org" secretName: moonzoo-org-tls - rules: - - host: moonzoo.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.moonzoo.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/muonhunter.org.yaml b/kubernetes/ingress/muonhunter.org.yaml index 3e4752f..7d352bb 100644 --- a/kubernetes/ingress/muonhunter.org.yaml +++ b/kubernetes/ingress/muonhunter.org.yaml @@ -13,39 +13,18 @@ spec: - muonhunter.org - "*.muonhunter.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: muonhunter.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`muonhunter.org`) || HostRegexp(`^.+\.muonhunter\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - muonhunter.org - - "*.muonhunter.org" secretName: muonhunter-org-tls - rules: - - host: muonhunter.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.muonhunter.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/muonhunters.org.yaml b/kubernetes/ingress/muonhunters.org.yaml index 3e63647..b6e9104 100644 --- a/kubernetes/ingress/muonhunters.org.yaml +++ b/kubernetes/ingress/muonhunters.org.yaml @@ -13,39 +13,18 @@ spec: - muonhunters.org - "*.muonhunters.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: muonhunters.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`muonhunters.org`) || HostRegexp(`^.+\.muonhunters\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - muonhunters.org - - "*.muonhunters.org" secretName: muonhunters-org-tls - rules: - - host: muonhunters.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.muonhunters.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/nameexoworlds.org.yaml b/kubernetes/ingress/nameexoworlds.org.yaml index ac42238..2350c32 100644 --- a/kubernetes/ingress/nameexoworlds.org.yaml +++ b/kubernetes/ingress/nameexoworlds.org.yaml @@ -13,39 +13,18 @@ spec: - nameexoworlds.org - "*.nameexoworlds.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: nameexoworlds.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`nameexoworlds.org`) || HostRegexp(`^.+\.nameexoworlds\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - nameexoworlds.org - - "*.nameexoworlds.org" secretName: nameexoworlds-org-tls - rules: - - host: nameexoworlds.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.nameexoworlds.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/notesfromnature.org.yaml b/kubernetes/ingress/notesfromnature.org.yaml index 697dc6b..8a03e1f 100644 --- a/kubernetes/ingress/notesfromnature.org.yaml +++ b/kubernetes/ingress/notesfromnature.org.yaml @@ -13,39 +13,18 @@ spec: - notesfromnature.org - "*.notesfromnature.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: notesfromnature.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`notesfromnature.org`) || HostRegexp(`^.+\.notesfromnature\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - notesfromnature.org - - "*.notesfromnature.org" secretName: notesfromnature-org-tls - rules: - - host: notesfromnature.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.notesfromnature.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/oldweather.org.yaml b/kubernetes/ingress/oldweather.org.yaml index d9c12e5..dcf95f1 100644 --- a/kubernetes/ingress/oldweather.org.yaml +++ b/kubernetes/ingress/oldweather.org.yaml @@ -13,39 +13,18 @@ spec: - oldweather.org - "*.oldweather.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: oldweather.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`oldweather.org`) || HostRegexp(`^.+\.oldweather\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - oldweather.org - - "*.oldweather.org" secretName: oldweather-org-tls - rules: - - host: oldweather.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.oldweather.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/operationwardiary.org.yaml b/kubernetes/ingress/operationwardiary.org.yaml index 5534f3f..8f9c45b 100644 --- a/kubernetes/ingress/operationwardiary.org.yaml +++ b/kubernetes/ingress/operationwardiary.org.yaml @@ -13,39 +13,18 @@ spec: - operationwardiary.org - "*.operationwardiary.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: - name: operationwardiary-org - 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/set-real-ip-from: "10.0.0.0/8" + name: operationwardiary.org spec: + entryPoints: + - websecure + routes: + - match: Host(`operationwardiary.org`) || HostRegexp(`^.+\.operationwardiary\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - operationwardiary.org - - "*.operationwardiary.org" secretName: operationwardiary-org-tls - rules: - - host: operationwardiary.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.operationwardiary.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/orchidobservers.org.yaml b/kubernetes/ingress/orchidobservers.org.yaml index 3813375..50122dc 100644 --- a/kubernetes/ingress/orchidobservers.org.yaml +++ b/kubernetes/ingress/orchidobservers.org.yaml @@ -13,39 +13,18 @@ spec: - orchidobservers.org - "*.orchidobservers.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: orchidobservers.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`orchidobservers.org`) || HostRegexp(`^.+\.orchidobservers\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - orchidobservers.org - - "*.orchidobservers.org" secretName: orchidobservers-org-tls - rules: - - host: orchidobservers.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.orchidobservers.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/penguinwatch.org.yaml b/kubernetes/ingress/penguinwatch.org.yaml deleted file mode 100644 index 709bb95..0000000 --- a/kubernetes/ingress/penguinwatch.org.yaml +++ /dev/null @@ -1,49 +0,0 @@ -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: penguinwatch-org-tls -spec: - issuerRef: - name: letsencrypt-prod - kind: ClusterIssuer - secretName: penguinwatch-org-tls - dnsNames: - - www.penguinwatch.org - - talk.penguinwatch.org ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: penguinwatch.org - 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/set-real-ip-from: "10.0.0.0/8" -spec: - tls: - - hosts: - - www.penguinwatch.org - - talk.penguinwatch.org - secretName: penguinwatch-org-tls - rules: - - host: www.penguinwatch.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: talk.penguinwatch.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/planet4.org.yaml b/kubernetes/ingress/planet4.org.yaml index 2af534e..0a71439 100644 --- a/kubernetes/ingress/planet4.org.yaml +++ b/kubernetes/ingress/planet4.org.yaml @@ -13,39 +13,18 @@ spec: - planet4.org - "*.planet4.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: planet4.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`planet4.org`) || HostRegexp(`^.+\.planet4\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - planet4.org - - "*.planet4.org" secretName: planet4-org-tls - rules: - - host: planet4.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.planet4.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/planet9search.org.yaml b/kubernetes/ingress/planet9search.org.yaml index cf632ed..b475067 100644 --- a/kubernetes/ingress/planet9search.org.yaml +++ b/kubernetes/ingress/planet9search.org.yaml @@ -13,39 +13,18 @@ spec: - planet9search.org - "*.planet9search.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: planet9search.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`planet9search.org`) || HostRegexp(`^.+\.planet9search\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - planet9search.org - - "*.planet9search.org" secretName: planet9search-org-tls - rules: - - host: planet9search.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.planet9search.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/planetaryresponsenetwork.com.yaml b/kubernetes/ingress/planetaryresponsenetwork.com.yaml index f5a2eb7..a127b59 100644 --- a/kubernetes/ingress/planetaryresponsenetwork.com.yaml +++ b/kubernetes/ingress/planetaryresponsenetwork.com.yaml @@ -13,39 +13,18 @@ spec: - planetaryresponsenetwork.com - "*.planetaryresponsenetwork.com" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: planetaryresponsenetwork.com - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`planetaryresponsenetwork.com`) || HostRegexp(`^.+\.planetaryresponsenetwork\.com$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - planetaryresponsenetwork.com - - "*.planetaryresponsenetwork.com" secretName: planetaryresponsenetwork-com-tls - rules: - - host: planetaryresponsenetwork.com - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.planetaryresponsenetwork.com" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/planetaryresponsenetwork.net.yaml b/kubernetes/ingress/planetaryresponsenetwork.net.yaml index f2c6495..7fcb6f5 100644 --- a/kubernetes/ingress/planetaryresponsenetwork.net.yaml +++ b/kubernetes/ingress/planetaryresponsenetwork.net.yaml @@ -13,39 +13,18 @@ spec: - planetaryresponsenetwork.net - "*.planetaryresponsenetwork.net" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: planetaryresponsenetwork.net - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`planetaryresponsenetwork.net`) || HostRegexp(`^.+\.planetaryresponsenetwork\.net$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - planetaryresponsenetwork.net - - "*.planetaryresponsenetwork.net" secretName: planetaryresponsenetwork-net-tls - rules: - - host: planetaryresponsenetwork.net - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.planetaryresponsenetwork.net" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/planetaryresponsenetwork.org.yaml b/kubernetes/ingress/planetaryresponsenetwork.org.yaml index 112ea4d..62bf473 100644 --- a/kubernetes/ingress/planetaryresponsenetwork.org.yaml +++ b/kubernetes/ingress/planetaryresponsenetwork.org.yaml @@ -13,39 +13,18 @@ spec: - planetaryresponsenetwork.org - "*.planetaryresponsenetwork.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: planetaryresponsenetwork.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`planetaryresponsenetwork.org`) || HostRegexp(`^.+\.planetaryresponsenetwork\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - planetaryresponsenetwork.org - - "*.planetaryresponsenetwork.org" secretName: planetaryresponsenetwork-org-tls - rules: - - host: planetaryresponsenetwork.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.planetaryresponsenetwork.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/planetfour.org.yaml b/kubernetes/ingress/planetfour.org.yaml index 55b20d8..c461c40 100644 --- a/kubernetes/ingress/planetfour.org.yaml +++ b/kubernetes/ingress/planetfour.org.yaml @@ -13,39 +13,18 @@ spec: - planetfour.org - "*.planetfour.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: - name: planetfour-org - 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/set-real-ip-from: "10.0.0.0/8" + name: planetfour.org spec: + entryPoints: + - websecure + routes: + - match: Host(`planetfour.org`) || HostRegexp(`^.+\.planetfour\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - planetfour.org - - "*.planetfour.org" secretName: planetfour-org-tls - rules: - - host: planetfour.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.planetfour.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/planethunters.org.yaml b/kubernetes/ingress/planethunters.org.yaml index e6c9840..9bca91a 100644 --- a/kubernetes/ingress/planethunters.org.yaml +++ b/kubernetes/ingress/planethunters.org.yaml @@ -13,39 +13,18 @@ spec: - planethunters.org - "*.planethunters.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: planethunters.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`planethunters.org`) || HostRegexp(`^.+\.planethunters\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - planethunters.org - - "*.planethunters.org" secretName: planethunters-org-tls - rules: - - host: planethunters.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.planethunters.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/planetninesearch.org.yaml b/kubernetes/ingress/planetninesearch.org.yaml index 200ff7e..2bb0967 100644 --- a/kubernetes/ingress/planetninesearch.org.yaml +++ b/kubernetes/ingress/planetninesearch.org.yaml @@ -13,39 +13,18 @@ spec: - planetninesearch.org - "*.planetninesearch.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: planetninesearch.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`planetninesearch.org`) || HostRegexp(`^.+\.planetninesearch\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - planetninesearch.org - - "*.planetninesearch.org" secretName: planetninesearch-org-tls - rules: - - host: planetninesearch.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.planetninesearch.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/planktonportal.org.yaml b/kubernetes/ingress/planktonportal.org.yaml index 4344ce7..d2c13d0 100644 --- a/kubernetes/ingress/planktonportal.org.yaml +++ b/kubernetes/ingress/planktonportal.org.yaml @@ -13,39 +13,18 @@ spec: - planktonportal.org - "*.planktonportal.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: - name: planktonportal-org - 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/set-real-ip-from: "10.0.0.0/8" + name: planktonportal.org spec: + entryPoints: + - websecure + routes: + - match: Host(`planktonportal.org`) || HostRegexp(`^.+\.planktonportal\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - planktonportal.org - - "*.planktonportal.org" secretName: planktonportal-org-tls - rules: - - host: planktonportal.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.planktonportal.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/pulsarhunter.com.yaml b/kubernetes/ingress/pulsarhunter.com.yaml index 4b4c3bc..3bf30c5 100644 --- a/kubernetes/ingress/pulsarhunter.com.yaml +++ b/kubernetes/ingress/pulsarhunter.com.yaml @@ -13,39 +13,18 @@ spec: - pulsarhunter.com - "*.pulsarhunter.com" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: pulsarhunter.com - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`pulsarhunter.com`) || HostRegexp(`^.+\.pulsarhunter\.com$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - pulsarhunter.com - - "*.pulsarhunter.com" secretName: pulsarhunter-com-tls - rules: - - host: pulsarhunter.com - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.pulsarhunter.com" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/pulsarhunter.org.yaml b/kubernetes/ingress/pulsarhunter.org.yaml index 5abd0f1..7b9d370 100644 --- a/kubernetes/ingress/pulsarhunter.org.yaml +++ b/kubernetes/ingress/pulsarhunter.org.yaml @@ -13,39 +13,18 @@ spec: - pulsarhunter.org - "*.pulsarhunter.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: pulsarhunter.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`pulsarhunter.org`) || HostRegexp(`^.+\.pulsarhunter\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - pulsarhunter.org - - "*.pulsarhunter.org" secretName: pulsarhunter-org-tls - rules: - - host: pulsarhunter.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.pulsarhunter.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/pulsarhunters.com.yaml b/kubernetes/ingress/pulsarhunters.com.yaml index 4a5f34d..ea4171f 100644 --- a/kubernetes/ingress/pulsarhunters.com.yaml +++ b/kubernetes/ingress/pulsarhunters.com.yaml @@ -13,39 +13,18 @@ spec: - pulsarhunters.com - "*.pulsarhunters.com" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: pulsarhunters.com - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`pulsarhunters.com`) || HostRegexp(`^.+\.pulsarhunters\.com$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - pulsarhunters.com - - "*.pulsarhunters.com" secretName: pulsarhunters-com-tls - rules: - - host: pulsarhunters.com - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.pulsarhunters.com" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/pulsarhunters.org.yaml b/kubernetes/ingress/pulsarhunters.org.yaml index 6700de8..9ebbfe9 100644 --- a/kubernetes/ingress/pulsarhunters.org.yaml +++ b/kubernetes/ingress/pulsarhunters.org.yaml @@ -13,39 +13,18 @@ spec: - pulsarhunters.org - "*.pulsarhunters.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: pulsarhunters.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`pulsarhunters.org`) || HostRegexp(`^.+\.pulsarhunters\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - pulsarhunters.org - - "*.pulsarhunters.org" secretName: pulsarhunters-org-tls - rules: - - host: pulsarhunters.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.pulsarhunters.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/rogueworlds.org.yaml b/kubernetes/ingress/rogueworlds.org.yaml index d817693..3c1f8d9 100644 --- a/kubernetes/ingress/rogueworlds.org.yaml +++ b/kubernetes/ingress/rogueworlds.org.yaml @@ -13,39 +13,18 @@ spec: - rogueworlds.org - "*.rogueworlds.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: rogueworlds.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`rogueworlds.org`) || HostRegexp(`^.+\.rogueworlds\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - rogueworlds.org - - "*.rogueworlds.org" secretName: rogueworlds-org-tls - rules: - - host: rogueworlds.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.rogueworlds.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/sciencegossip.org.yaml b/kubernetes/ingress/sciencegossip.org.yaml index 65d849c..531bc73 100644 --- a/kubernetes/ingress/sciencegossip.org.yaml +++ b/kubernetes/ingress/sciencegossip.org.yaml @@ -13,39 +13,18 @@ spec: - sciencegossip.org - "*.sciencegossip.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: sciencegossip.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`sciencegossip.org`) || HostRegexp(`^.+\.sciencegossip\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - sciencegossip.org - - "*.sciencegossip.org" secretName: sciencegossip-org-tls - rules: - - host: sciencegossip.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.sciencegossip.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/scribesofthecairogeniza.org.yaml b/kubernetes/ingress/scribesofthecairogeniza.org.yaml index 98a8a4e..c1aa382 100644 --- a/kubernetes/ingress/scribesofthecairogeniza.org.yaml +++ b/kubernetes/ingress/scribesofthecairogeniza.org.yaml @@ -13,39 +13,18 @@ spec: - scribesofthecairogeniza.org - "*.scribesofthecairogeniza.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: scribesofthecairogeniza.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`scribesofthecairogeniza.org`) || HostRegexp(`^.+\.scribesofthecairogeniza\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - scribesofthecairogeniza.org - - "*.scribesofthecairogeniza.org" secretName: scribesofthecairogeniza-org-tls - rules: - - host: scribesofthecairogeniza.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.scribesofthecairogeniza.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/seabirdwatch.org.yaml b/kubernetes/ingress/seabirdwatch.org.yaml index 50180e8..8af8683 100644 --- a/kubernetes/ingress/seabirdwatch.org.yaml +++ b/kubernetes/ingress/seabirdwatch.org.yaml @@ -13,39 +13,18 @@ spec: - seabirdwatch.org - www.seabirdwatch.org --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: seabirdwatch.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`seabirdwatch.org`) || Host(`www.seabirdwatch.org`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - seabirdwatch.org - - www.seabirdwatch.org secretName: seabirdwatch-org-tls - rules: - - host: seabirdwatch.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: www.seabirdwatch.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/seafloorexplorer.org.yaml b/kubernetes/ingress/seafloorexplorer.org.yaml index 6c6d78b..89da00d 100644 --- a/kubernetes/ingress/seafloorexplorer.org.yaml +++ b/kubernetes/ingress/seafloorexplorer.org.yaml @@ -13,39 +13,18 @@ spec: - seafloorexplorer.org - "*.seafloorexplorer.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: seafloorexplorer.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`seafloorexplorer.org`) || HostRegexp(`^.+\.seafloorexplorer\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - seafloorexplorer.org - - "*.seafloorexplorer.org" secretName: seafloorexplorer-org-tls - rules: - - host: seafloorexplorer.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.seafloorexplorer.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/setilive.org.yaml b/kubernetes/ingress/setilive.org.yaml index 03b0c33..ebc29bd 100644 --- a/kubernetes/ingress/setilive.org.yaml +++ b/kubernetes/ingress/setilive.org.yaml @@ -13,39 +13,18 @@ spec: - setilive.org - "*.setilive.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: - name: setilive-org - 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/set-real-ip-from: "10.0.0.0/8" + name: setilive.org spec: + entryPoints: + - websecure + routes: + - match: Host(`setilive.org`) || HostRegexp(`^.+\.setilive\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - setilive.org - - "*.setilive.org" secretName: setilive-org-tls - rules: - - host: setilive.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.setilive.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/shakespearesworld.org.yaml b/kubernetes/ingress/shakespearesworld.org.yaml index 238931e..79fb2a7 100644 --- a/kubernetes/ingress/shakespearesworld.org.yaml +++ b/kubernetes/ingress/shakespearesworld.org.yaml @@ -13,39 +13,18 @@ spec: - shakespearesworld.org - "*.shakespearesworld.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: shakespearesworld.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`shakespearesworld.org`) || HostRegexp(`^.+\.shakespearesworld\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - shakespearesworld.org - - "*.shakespearesworld.org" secretName: shakespearesworld-org-tls - rules: - - host: shakespearesworld.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.shakespearesworld.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/snapshotserengeti.org.yaml b/kubernetes/ingress/snapshotserengeti.org.yaml index 9838231..92f20f9 100644 --- a/kubernetes/ingress/snapshotserengeti.org.yaml +++ b/kubernetes/ingress/snapshotserengeti.org.yaml @@ -13,39 +13,18 @@ spec: - snapshotserengeti.org - "*.snapshotserengeti.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: snapshotserengeti.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`snapshotserengeti.org`) || HostRegexp(`^.+\.snapshotserengeti\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - snapshotserengeti.org - - "*.snapshotserengeti.org" secretName: snapshotserengeti-org-tls - rules: - - host: snapshotserengeti.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.snapshotserengeti.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/snapshotsupernova.org.yaml b/kubernetes/ingress/snapshotsupernova.org.yaml index c977a43..e36e74f 100644 --- a/kubernetes/ingress/snapshotsupernova.org.yaml +++ b/kubernetes/ingress/snapshotsupernova.org.yaml @@ -13,39 +13,18 @@ spec: - snapshotsupernova.org - "*.snapshotsupernova.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: snapshotsupernova.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`snapshotsupernova.org`) || HostRegexp(`^.+\.snapshotsupernova\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - snapshotsupernova.org - - "*.snapshotsupernova.org" secretName: snapshotsupernova-org-tls - rules: - - host: snapshotsupernova.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.snapshotsupernova.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/snapshotsupernovae.org.yaml b/kubernetes/ingress/snapshotsupernovae.org.yaml index 3239f52..f610394 100644 --- a/kubernetes/ingress/snapshotsupernovae.org.yaml +++ b/kubernetes/ingress/snapshotsupernovae.org.yaml @@ -13,39 +13,18 @@ spec: - snapshotsupernovae.org - "*.snapshotsupernovae.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: snapshotsupernovae.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`snapshotsupernovae.org`) || HostRegexp(`^.+\.snapshotsupernovae\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - snapshotsupernovae.org - - "*.snapshotsupernovae.org" secretName: snapshotsupernovae-org-tls - rules: - - host: snapshotsupernovae.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.snapshotsupernovae.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/solarstormwatch.com.yaml b/kubernetes/ingress/solarstormwatch.com.yaml index 2074b05..9ccd22f 100644 --- a/kubernetes/ingress/solarstormwatch.com.yaml +++ b/kubernetes/ingress/solarstormwatch.com.yaml @@ -13,39 +13,18 @@ spec: - solarstormwatch.com - "*.solarstormwatch.com" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: solarstormwatch.com - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`solarstormwatch.com`) || HostRegexp(`^.+\.solarstormwatch\.com$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - solarstormwatch.com - - "*.solarstormwatch.com" secretName: solarstormwatch-com-tls - rules: - - host: solarstormwatch.com - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.solarstormwatch.com" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/spacewarps.org.yaml b/kubernetes/ingress/spacewarps.org.yaml index 14ab8eb..88edece 100644 --- a/kubernetes/ingress/spacewarps.org.yaml +++ b/kubernetes/ingress/spacewarps.org.yaml @@ -13,39 +13,18 @@ spec: - spacewarps.org - "*.spacewarps.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: - name: spacewarps-org - 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/set-real-ip-from: "10.0.0.0/8" + name: spacewarps.org spec: + entryPoints: + - websecure + routes: + - match: Host(`spacewarps.org`) || HostRegexp(`^.+\.spacewarps\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - spacewarps.org - - "*.spacewarps.org" secretName: spacewarps-org-tls - rules: - - host: spacewarps.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.spacewarps.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/sunspotter.org.yaml b/kubernetes/ingress/sunspotter.org.yaml index 458001a..ed55a69 100644 --- a/kubernetes/ingress/sunspotter.org.yaml +++ b/kubernetes/ingress/sunspotter.org.yaml @@ -13,39 +13,18 @@ spec: - sunspotter.org - "*.sunspotter.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: sunspotter.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`sunspotter.org`) || HostRegexp(`^.+\.sunspotter\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - sunspotter.org - - "*.sunspotter.org" secretName: sunspotter-org-tls - rules: - - host: sunspotter.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.sunspotter.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/supernovahunters.org.yaml b/kubernetes/ingress/supernovahunters.org.yaml index 95ea0a3..01c2050 100644 --- a/kubernetes/ingress/supernovahunters.org.yaml +++ b/kubernetes/ingress/supernovahunters.org.yaml @@ -13,39 +13,18 @@ spec: - supernovahunters.org - www.supernovahunters.org --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: supernovahunters.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`supernovahunters.org`) || Host(`www.supernovahunters.org`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - supernovahunters.org - - www.supernovahunters.org secretName: supernovahunters-org-tls - rules: - - host: supernovahunters.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: www.supernovahunters.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/supernovasighting.org.yaml b/kubernetes/ingress/supernovasighting.org.yaml index 2b023b6..c21f521 100644 --- a/kubernetes/ingress/supernovasighting.org.yaml +++ b/kubernetes/ingress/supernovasighting.org.yaml @@ -13,39 +13,18 @@ spec: - supernovasighting.org - "*.supernovasighting.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: supernovasighting.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`supernovasighting.org`) || HostRegexp(`^.+\.supernovasighting\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - supernovasighting.org - - "*.supernovasighting.org" secretName: supernovasighting-org-tls - rules: - - host: supernovasighting.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.supernovasighting.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/theandromedaproject.org.yaml b/kubernetes/ingress/theandromedaproject.org.yaml index d95462e..09f11dc 100644 --- a/kubernetes/ingress/theandromedaproject.org.yaml +++ b/kubernetes/ingress/theandromedaproject.org.yaml @@ -13,39 +13,18 @@ spec: - theandromedaproject.org - "*.theandromedaproject.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: theandromedaproject.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`theandromedaproject.org`) || HostRegexp(`^.+\.theandromedaproject\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - theandromedaproject.org - - "*.theandromedaproject.org" secretName: theandromedaproject-org-tls - rules: - - host: theandromedaproject.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.theandromedaproject.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/thetriangulumproject.org.yaml b/kubernetes/ingress/thetriangulumproject.org.yaml index a615ecc..a0f1364 100644 --- a/kubernetes/ingress/thetriangulumproject.org.yaml +++ b/kubernetes/ingress/thetriangulumproject.org.yaml @@ -13,39 +13,18 @@ spec: - thetriangulumproject.org - "*.thetriangulumproject.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: thetriangulumproject.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`thetriangulumproject.org`) || HostRegexp(`^.+\.thetriangulumproject\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - thetriangulumproject.org - - "*.thetriangulumproject.org" secretName: thetriangulumproject-org-tls - rules: - - host: thetriangulumproject.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.thetriangulumproject.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/thezooniverse.org.yaml b/kubernetes/ingress/thezooniverse.org.yaml index 0e24cc5..4595770 100644 --- a/kubernetes/ingress/thezooniverse.org.yaml +++ b/kubernetes/ingress/thezooniverse.org.yaml @@ -13,39 +13,18 @@ spec: - thezooniverse.org - "*.thezooniverse.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: thezooniverse.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`thezooniverse.org`) || HostRegexp(`^.+\.thezooniverse\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - thezooniverse.org - - "*.thezooniverse.org" secretName: thezooniverse-org-tls - rules: - - host: thezooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.thezooniverse.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/usawildlifewatch.org.yaml b/kubernetes/ingress/usawildlifewatch.org.yaml index 061b78a..eea760b 100644 --- a/kubernetes/ingress/usawildlifewatch.org.yaml +++ b/kubernetes/ingress/usawildlifewatch.org.yaml @@ -13,39 +13,18 @@ spec: - usawildlifewatch.org - "*.usawildlifewatch.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: usawildlifewatch.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`usawildlifewatch.org`) || HostRegexp(`^.+\.usawildlifewatch\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - usawildlifewatch.org - - "*.usawildlifewatch.org" secretName: usawildlifewatch-org-tls - rules: - - host: usawildlifewatch.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.usawildlifewatch.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/wildcamdarien.org.yaml b/kubernetes/ingress/wildcamdarien.org.yaml index 321d1f0..e6a3428 100644 --- a/kubernetes/ingress/wildcamdarien.org.yaml +++ b/kubernetes/ingress/wildcamdarien.org.yaml @@ -13,39 +13,18 @@ spec: - wildcamdarien.org - "*.wildcamdarien.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: wildcamdarien.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`wildcamdarien.org`) || HostRegexp(`^.+\.wildcamdarien\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - wildcamdarien.org - - "*.wildcamdarien.org" secretName: wildcamdarien-org-tls - rules: - - host: wildcamdarien.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.wildcamdarien.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/wildcamgorongosa.org.yaml b/kubernetes/ingress/wildcamgorongosa.org.yaml index 951bd94..cba8529 100644 --- a/kubernetes/ingress/wildcamgorongosa.org.yaml +++ b/kubernetes/ingress/wildcamgorongosa.org.yaml @@ -15,61 +15,18 @@ spec: - lab.wildcamgorongosa.org - learn.wildcamgorongosa.org --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: wildcamgorongosa.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`wildcamgorongosa.org`) || Host(`www.wildcamgorongosa.org`) || Host(`lab.wildcamgorongosa.org`) || Host(`learn.wildcamgorongosa.org`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - wildcamgorongosa.org - - www.wildcamgorongosa.org - - lab.wildcamgorongosa.org - - learn.wildcamgorongosa.org secretName: wildcamgorongosa-org-tls - rules: - - host: wildcamgorongosa.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "www.wildcamgorongosa.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "lab.wildcamgorongosa.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "learn.wildcamgorongosa.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/wisconsinwildlifewatch.org.yaml b/kubernetes/ingress/wisconsinwildlifewatch.org.yaml index e4d700c..0faa818 100644 --- a/kubernetes/ingress/wisconsinwildlifewatch.org.yaml +++ b/kubernetes/ingress/wisconsinwildlifewatch.org.yaml @@ -13,39 +13,18 @@ spec: - wisconsinwildlifewatch.org - "*.wisconsinwildlifewatch.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: wisconsinwildlifewatch.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`wisconsinwildlifewatch.org`) || HostRegexp(`^.+\.wisconsinwildlifewatch\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - wisconsinwildlifewatch.org - - "*.wisconsinwildlifewatch.org" secretName: wisconsinwildlifewatch-org-tls - rules: - - host: wisconsinwildlifewatch.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.wisconsinwildlifewatch.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 \ No newline at end of file diff --git a/kubernetes/ingress/wormwatchlab.org.yaml b/kubernetes/ingress/wormwatchlab.org.yaml index 8c50c89..24b5639 100644 --- a/kubernetes/ingress/wormwatchlab.org.yaml +++ b/kubernetes/ingress/wormwatchlab.org.yaml @@ -13,39 +13,18 @@ spec: - wormwatchlab.org - "*.wormwatchlab.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: - name: wormwatchlab-org - 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/set-real-ip-from: "10.0.0.0/8" + name: wormwatchlab.org spec: + entryPoints: + - websecure + routes: + - match: Host(`wormwatchlab.org`) || HostRegexp(`^.+\.wormwatchlab\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - wormwatchlab.org - - "*.wormwatchlab.org" secretName: wormwatchlab-org-tls - rules: - - host: wormwatchlab.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.wormwatchlab.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/zooinverse.org.yaml b/kubernetes/ingress/zooinverse.org.yaml index ad8e8d0..e2e4716 100644 --- a/kubernetes/ingress/zooinverse.org.yaml +++ b/kubernetes/ingress/zooinverse.org.yaml @@ -13,39 +13,18 @@ spec: - zooinverse.org - "*.zooinverse.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: - name: zooinverse-org - 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/set-real-ip-from: "10.0.0.0/8" + name: zooinverse.org spec: + entryPoints: + - websecure + routes: + - match: Host(`zooinverse.org`) || HostRegexp(`^.+\.zooinverse\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - zooinverse.org - - "*.zooinverse.org" secretName: zooinverse-org-tls - rules: - - host: zooinverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.zooinverse.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/zooniverse.org.yaml b/kubernetes/ingress/zooniverse.org.yaml index 5bb3083..2d19c1a 100644 --- a/kubernetes/ingress/zooniverse.org.yaml +++ b/kubernetes/ingress/zooniverse.org.yaml @@ -18,545 +18,132 @@ spec: - "*.lab-preview.zooniverse.org" - "*.azure.zooniverse.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: zooniverse-org-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: 6m - nginx.ingress.kubernetes.io/set-real-ip-from: "10.0.0.0/8" + namespace: default spec: + entryPoints: + - websecure tls: - - hosts: - - zooniverse.org - - "*.zooniverse.org" - - "*.staging.zooniverse.org" - - "*.preview.zooniverse.org" - - "*.pfe-preview.zooniverse.org" - - "*.lab-preview.zooniverse.org" - - "*.azure.zooniverse.org" secretName: zooniverse-org-tls - rules: - - host: zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.zooniverse.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.staging.zooniverse.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.preview.zooniverse.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.pfe-preview.zooniverse.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.lab-preview.zooniverse.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.azure.zooniverse.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: aggregation-staging.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: aggregation-staging-app - port: - number: 80 - - host: aggregation-caesar.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: aggregation-production-app - port: - number: 80 - - host: caesar-staging.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: caesar-staging-app - port: - number: 80 - - host: caesar.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: caesar-production-app - port: - number: 80 - - host: cellect-staging.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: cellect-staging-app - port: - number: 80 - - host: cellect.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: cellect-production-app - port: - number: 80 - - host: classroom-maps-api.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: classroom-maps-api-production-app - port: - number: 80 - - host: designator-staging.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: designator-staging-app - port: - number: 80 - - host: designator.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: designator-production-app - port: - number: 80 - - host: education-api-staging.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: education-api-staging-app - port: - number: 80 - - host: education-api.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: education-api-production-app - port: - number: 80 - - host: eras.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: eras-production-app - port: - number: 80 - - host: eras-staging.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: eras-staging-app - port: - number: 80 - - host: fe-content-pages.preview.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: zooniverse-org-content-pages-staging - port: - number: 80 - - host: fe-content-pages.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: zooniverse-org-content-pages-production - port: - number: 80 - - host: fe-project-branch.preview.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: zooniverse-org-project-branch - port: - number: 80 - - host: fe-project.preview.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: zooniverse-org-project-staging - port: - number: 80 - - host: fe-project.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: zooniverse-org-project-production - port: - number: 80 - - host: fe-root.preview.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: zooniverse-org-root-staging - port: - number: 80 - - host: fe-root.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: zooniverse-org-root-production - port: - number: 80 - - host: fe-static.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: zooniverse-org-project-static - port: - number: 80 - - host: grafana-stats.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: zoo-event-stats-grafana - port: - number: 80 - - host: graphql-stats.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: zoo-event-stats-graphql - port: - number: 80 - - host: imgproc.azure.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: image-proc - port: - number: 80 - - host: interventions-gateway-staging.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: interventions-gateway-staging - port: - number: 80 - - host: interventions-gateway.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: interventions-gateway-production - port: - number: 80 - - host: links.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: listmonk.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: listmonk - port: - number: 80 - - host: notifications-staging.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: sugar-staging-app - port: - number: 80 - - host: notifications.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: sugar-production-app - port: - number: 80 - - host: passbolt.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: passbolt - port: - number: 80 - - host: ses-bounces.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: email-verify - port: - number: 80 - - host: seven-ten-staging.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: seven-ten-staging-app - port: - number: 80 - - host: seven-ten.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: seven-ten-production-app - port: - number: 80 - - host: static-staging.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend-staging - port: - number: 80 - - host: stats-staging.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: zoo-event-stats-staging - port: - number: 80 - - host: stats.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: zoo-event-stats-production-api - port: - number: 80 - - host: subject-assistant-proxy.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: subject-assistant-proxy - port: - number: 80 - - host: subject-set-search-api.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: subject-set-search-api-production-app - port: - number: 80 - - host: theia-staging.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: theia-staging-app - port: - number: 80 - - host: theia.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: theia-production-app - port: - number: 80 - - host: thumbnails.azure.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: thumbnailer - port: - number: 80 - - host: tove-staging.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: tove-staging-app - port: - number: 80 - - host: tove.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: tove-production-app - port: - number: 80 - - host: zoomapper.azure.zooniverse.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: zoomapper-production-app - port: - number: 80 + routes: + + # Manually set priority for catch-alls the specific apps below always win + - match: Host(`zooniverse.org`) || HostRegexp(`{sub:[a-z0-9-]+}.zooniverse.org`) || HostRegexp(`{sub:[a-z0-9-]+}.staging.zooniverse.org`) || HostRegexp(`{sub:[a-z0-9-]+}.preview.zooniverse.org`) || HostRegexp(`{sub:[a-z0-9-]+}.pfe-preview.zooniverse.org`) || HostRegexp(`{sub:[a-z0-9-]+}.lab-preview.zooniverse.org`) || HostRegexp(`{sub:[a-z0-9-]+}.azure.zooniverse.org`) + kind: Rule + priority: 10 + services: + - name: http-frontend + port: 80 + + # Default, length-based priorities, all greater than 10 + - match: Host(`aggregation-staging.zooniverse.org`) + kind: Rule + services: [{name: aggregation-staging-app, port: 80}] + - match: Host(`aggregation-caesar.zooniverse.org`) + kind: Rule + services: [{name: aggregation-production-app, port: 80}] + - match: Host(`caesar-staging.zooniverse.org`) + kind: Rule + services: [{name: caesar-staging-app, port: 80}] + - match: Host(`caesar.zooniverse.org`) + kind: Rule + services: [{name: caesar-production-app, port: 80}] + - match: Host(`classroom-maps-api.zooniverse.org`) + kind: Rule + services: [{name: classroom-maps-api-production-app, port: 80}] + - match: Host(`designator-staging.zooniverse.org`) + kind: Rule + services: [{name: designator-staging-app, port: 80}] + - match: Host(`designator.zooniverse.org`) + kind: Rule + services: [{name: designator-production-app, port: 80}] + - match: Host(`education-api-staging.zooniverse.org`) + kind: Rule + services: [{name: education-api-staging-app, port: 80}] + - match: Host(`education-api.zooniverse.org`) + kind: Rule + services: [{name: education-api-production-app, port: 80}] + - match: Host(`eras.zooniverse.org`) + kind: Rule + services: [{name: eras-production-app, port: 80}] + - match: Host(`eras-staging.zooniverse.org`) + kind: Rule + services: [{name: eras-staging-app, port: 80}] + - match: Host(`fe-project-branch.preview.zooniverse.org`) + kind: Rule + services: [{name: zooniverse-org-project-branch, port: 80}] + - match: Host(`fe-project.preview.zooniverse.org`) + kind: Rule + services: [{name: zooniverse-org-project-staging, port: 80}] + - match: Host(`fe-project.zooniverse.org`) + kind: Rule + services: [{name: zooniverse-org-project-production, port: 80}] + - match: Host(`fe-root.preview.zooniverse.org`) + kind: Rule + services: [{name: zooniverse-org-root-staging, port: 80}] + - match: Host(`fe-root.zooniverse.org`) + kind: Rule + services: [{name: zooniverse-org-root-production, port: 80}] + - match: Host(`fe-static.zooniverse.org`) + kind: Rule + services: [{name: zooniverse-org-project-static, port: 80}] + - match: Host(`imgproc.azure.zooniverse.org`) + kind: Rule + services: [{name: image-proc, port: 80}] + - match: Host(`interventions-gateway-staging.zooniverse.org`) + kind: Rule + services: [{name: interventions-gateway-staging, port: 80}] + - match: Host(`interventions-gateway.zooniverse.org`) + kind: Rule + services: [{name: interventions-gateway-production, port: 80}] + - match: Host(`links.zooniverse.org`) + kind: Rule + services: [{name: http-frontend, port: 80}] + - match: Host(`listmonk.zooniverse.org`) + kind: Rule + services: [{name: listmonk, port: 80}] + - match: Host(`notifications-staging.zooniverse.org`) + kind: Rule + services: [{name: sugar-staging-app, port: 80}] + - match: Host(`notifications.zooniverse.org`) + kind: Rule + services: [{name: sugar-production-app, port: 80}] + - match: Host(`passbolt.zooniverse.org`) + kind: Rule + services: [{name: passbolt, port: 80}] + - match: Host(`ses-bounces.zooniverse.org`) + kind: Rule + services: [{name: email-verify, port: 80}] + - match: Host(`seven-ten-staging.zooniverse.org`) + kind: Rule + services: [{name: http-frontend-staging, port: 80}] + - match: Host(`stats.zooniverse.org`) + kind: Rule + services: [{name: zoo-event-stats-production-api, port: 80}] + - match: Host(`subject-assistant-proxy.zooniverse.org`) + kind: Rule + services: [{name: subject-assistant-proxy, port: 80}] + - match: Host(`subject-set-search-api.zooniverse.org`) + kind: Rule + services: [{name: subject-set-search-api-production-app, port: 80}] + - match: Host(`theia-staging.zooniverse.org`) + kind: Rule + services: [{name: theia-staging-app, port: 80}] + - match: Host(`theia.zooniverse.org`) + kind: Rule + services: [{name: theia-production-app, port: 80}] + - match: Host(`thumbnails.azure.zooniverse.org`) + kind: Rule + services: [{name: thumbnailer, port: 80}] + - match: Host(`tove-staging.zooniverse.org`) + kind: Rule + services: [{name: tove-staging-app, port: 80}] + - match: Host(`tove.zooniverse.org`) + kind: Rule + services: [{name: tove-production-app, port: 80}] + - match: Host(`zoomapper.azure.zooniverse.org`) + kind: Rule + services: [{name: zoomapper-production-app, port: 80}] diff --git a/kubernetes/ingress/zooteach.org.yaml b/kubernetes/ingress/zooteach.org.yaml index ac25557..fe04239 100644 --- a/kubernetes/ingress/zooteach.org.yaml +++ b/kubernetes/ingress/zooteach.org.yaml @@ -13,39 +13,18 @@ spec: - zooteach.org - "*.zooteach.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: zooteach.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`zooteach.org`) || HostRegexp(`^.+\.zooteach\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - zooteach.org - - "*.zooteach.org" secretName: zooteach-org-tls - rules: - - host: zooteach.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.zooteach.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 diff --git a/kubernetes/ingress/zwickytransients.org.yaml b/kubernetes/ingress/zwickytransients.org.yaml index 2d31339..4c5eb97 100644 --- a/kubernetes/ingress/zwickytransients.org.yaml +++ b/kubernetes/ingress/zwickytransients.org.yaml @@ -13,39 +13,18 @@ spec: - zwickytransients.org - "*.zwickytransients.org" --- -apiVersion: networking.k8s.io/v1 -kind: Ingress +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute metadata: name: zwickytransients.org - 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/set-real-ip-from: "10.0.0.0/8" spec: + entryPoints: + - websecure + routes: + - match: Host(`zwickytransients.org`) || HostRegexp(`^.+\.zwickytransients\.org$`) + kind: Rule + services: + - name: http-frontend + port: 80 tls: - - hosts: - - zwickytransients.org - - "*.zwickytransients.org" secretName: zwickytransients-org-tls - rules: - - host: zwickytransients.org - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80 - - host: "*.zwickytransients.org" - http: - paths: - - pathType: Prefix - path: / - backend: - service: - name: http-frontend - port: - number: 80