diff --git a/adguardhome/k8s/ingress.yaml b/adguardhome/k8s/ingress.yaml index b5b73a9..88e5183 100644 --- a/adguardhome/k8s/ingress.yaml +++ b/adguardhome/k8s/ingress.yaml @@ -1,52 +1,52 @@ apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: adguard-prod - namespace: adguard + name: adguard-prod + namespace: adguard spec: - entryPoints: - - websecure - routes: - - match: Host(`adguard.forust.xyz`) || Host(`dns.forust.xyz`) - kind: Rule - middlewares: - - name: "crowdsec-crowdsec-bouncer@kubernetescrd" - services: - - name: adguard-service - port: 3000 - tls: - certResolver: letsencrypt + entryPoints: + - websecure + routes: + - match: Host(`adguard.forust.xyz`) || Host(`dns.forust.xyz`) + kind: Rule + middlewares: + - name: "crowdsec-crowdsec-bouncer@kubernetescrd" + services: + - name: adguard-service + port: 3000 + tls: + certResolver: letsencrypt --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: adguard-local - namespace: adguard + name: adguard-local + namespace: adguard spec: - entryPoints: - - websecure - routes: - - match: HostRegexp(`^(adguard|dns)\.(workstation|gigaforust)\.internal$`) - kind: Rule - services: - - name: adguard-service - port: 3000 + entryPoints: + - websecure + routes: + - match: Host(`adguard.workstation.internal`) || Host(`dns.workstation.internal`) || Host(`adguard.gigaforust.internal`) || Host(`dns.gigaforust.internal`) + kind: Rule + services: + - name: adguard-service + port: 3000 --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: adguard-doh - namespace: adguard + name: adguard-doh + namespace: adguard spec: - entryPoints: - - websecure - routes: - - match: (Host(`adguard.forust.xyz`) || Host(`dns.forust.xyz`)) && PathPrefix(`/dns-query`) - kind: Rule - middlewares: - - name: "crowdsec-crowdsec-bouncer@kubernetescrd" - services: - - name: adguard-service - port: 3000 - tls: - certResolver: letsencrypt + entryPoints: + - websecure + routes: + - match: (Host(`adguard.forust.xyz`) || Host(`dns.forust.xyz`)) && PathPrefix(`/dns-query`) + kind: Rule + middlewares: + - name: "crowdsec-crowdsec-bouncer@kubernetescrd" + services: + - name: adguard-service + port: 3000 + tls: + certResolver: letsencrypt diff --git a/authentik/k8s/ingress.yaml b/authentik/k8s/ingress.yaml index 720b03c..c25087b 100644 --- a/authentik/k8s/ingress.yaml +++ b/authentik/k8s/ingress.yaml @@ -26,7 +26,7 @@ spec: entryPoints: - websecure routes: - - match: HostRegexp(`^auth\.(workstation|gigaforust)\.internal$`) + - match: Host(`auth.workstation.internal`) || Host(`auth.gigaforust.internal`) kind: Rule services: - name: authentik-server-service diff --git a/checkmk/k8s/ingress.yaml b/checkmk/k8s/ingress.yaml index dad4ad3..c30fba0 100644 --- a/checkmk/k8s/ingress.yaml +++ b/checkmk/k8s/ingress.yaml @@ -1,33 +1,33 @@ apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: checkmk-prod - namespace: checkmk + name: checkmk-prod + namespace: checkmk spec: - entryPoints: - - websecure - routes: - - match: Host(`cmk.forust.xyz`) - kind: Rule - middlewares: - - name: crowdsec-crowdsec-bouncer@kubernetescrd - services: - - name: checkmk-service - port: 5000 - tls: - certResolver: letsencrypt + entryPoints: + - websecure + routes: + - match: Host(`cmk.forust.xyz`) + kind: Rule + middlewares: + - name: crowdsec-crowdsec-bouncer@kubernetescrd + services: + - name: checkmk-service + port: 5000 + tls: + certResolver: letsencrypt --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: checkmk-local - namespace: checkmk + name: checkmk-local + namespace: checkmk spec: - entryPoints: - - websecure - routes: - - match: HostRegexp(`^cmk\.(workstation|gigaforust)\.internal$`) - kind: Rule - services: - - name: checkmk-service - port: 5000 + entryPoints: + - websecure + routes: + - match: Host(`cmk.workstation.internal`) || Host(`cmk.gigaforust.internal`) + kind: Rule + services: + - name: checkmk-service + port: 5000 diff --git a/converters/k8s/ingress.yaml b/converters/k8s/ingress.yaml index 530ab29..e6b4d39 100644 --- a/converters/k8s/ingress.yaml +++ b/converters/k8s/ingress.yaml @@ -1,65 +1,65 @@ apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: convertx-prod - namespace: converters + name: convertx-prod + namespace: converters spec: - entryPoints: - - websecure - routes: - - match: (Host(`forust.xyz`) || Host(`www.forust.xyz`)) && PathPrefix(`/convert`) - kind: Rule - priority: 50 - services: - - name: convertx-service - port: 3000 - tls: - certResolver: letsencrypt + entryPoints: + - websecure + routes: + - match: (Host(`forust.xyz`) || Host(`www.forust.xyz`)) && PathPrefix(`/convert`) + kind: Rule + priority: 50 + services: + - name: convertx-service + port: 3000 + tls: + certResolver: letsencrypt --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: convertx-local - namespace: converters + name: convertx-local + namespace: converters spec: - entryPoints: - - websecure - routes: - - match: HostRegexp(`^(workstation|gigaforust)\.internal$`) && PathPrefix(`/convert`) - kind: Rule - priority: 50 - services: - - name: convertx-service - port: 3000 + entryPoints: + - websecure + routes: + - match: (Host(`workstation.internal`) || Host(`gigaforust.internal`)) && PathPrefix(`/convert`) + kind: Rule + priority: 50 + services: + - name: convertx-service + port: 3000 --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: bentopdf-prod - namespace: converters + name: bentopdf-prod + namespace: converters spec: - entryPoints: - - websecure - routes: - - match: Host(`pdf.forust.xyz`) - kind: Rule - services: - - name: bentopdf-service - port: 8080 - tls: - certResolver: letsencrypt + entryPoints: + - websecure + routes: + - match: Host(`pdf.forust.xyz`) + kind: Rule + services: + - name: bentopdf-service + port: 8080 + tls: + certResolver: letsencrypt --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: bentopdf-local - namespace: converters + name: bentopdf-local + namespace: converters spec: - entryPoints: - - websecure - routes: - - match: HostRegexp(`^pdf\.(workstation|gigaforust)\.internal$`) - kind: Rule - services: - - name: bentopdf-service - port: 8080 + entryPoints: + - websecure + routes: + - match: Host(`pdf.workstation.internal`) || Host(`pdf.gigaforust.internal`) + kind: Rule + services: + - name: bentopdf-service + port: 8080 diff --git a/dockmon/k8s/ingress.yaml b/dockmon/k8s/ingress.yaml index 0c7781d..8b57661 100644 --- a/dockmon/k8s/ingress.yaml +++ b/dockmon/k8s/ingress.yaml @@ -1,44 +1,44 @@ apiVersion: traefik.io/v1alpha1 kind: ServersTransport metadata: - name: dockmon-transport - namespace: dockmon + name: dockmon-transport + namespace: dockmon spec: - insecureSkipVerify: true + insecureSkipVerify: true --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: dockmon-prod - namespace: dockmon + name: dockmon-prod + namespace: dockmon spec: - entryPoints: - - websecure - routes: - - match: Host(`dockmon.forust.xyz`) - kind: Rule - middlewares: - - name: crowdsec-crowdsec-bouncer@kubernetescrd - - name: security-headers@file - services: - - name: dockmon-service - port: 443 - serversTransport: dockmon-transport - tls: - certResolver: letsencrypt + entryPoints: + - websecure + routes: + - match: Host(`dockmon.forust.xyz`) + kind: Rule + middlewares: + - name: crowdsec-crowdsec-bouncer@kubernetescrd + - name: security-headers@file + services: + - name: dockmon-service + port: 443 + serversTransport: dockmon-transport + tls: + certResolver: letsencrypt --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: dockmon-local - namespace: dockmon + name: dockmon-local + namespace: dockmon spec: - entryPoints: - - websecure - routes: - - match: HostRegexp(`^dockmon\.(workstation|gigaforust)\.internal$`) - kind: Rule - services: - - name: dockmon-service - port: 443 - serversTransport: dockmon-transport + entryPoints: + - websecure + routes: + - match: Host(`dockmon.workstation.internal`) || Host(`dockmon.gigaforust.internal`) + kind: Rule + services: + - name: dockmon-service + port: 443 + serversTransport: dockmon-transport diff --git a/downtify/k8s/ingress.yaml b/downtify/k8s/ingress.yaml index 5b353ae..d98e6d1 100644 --- a/downtify/k8s/ingress.yaml +++ b/downtify/k8s/ingress.yaml @@ -1,34 +1,34 @@ apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: downtify-prod - namespace: downtify + name: downtify-prod + namespace: downtify spec: - entryPoints: - - websecure - routes: - - match: Host(`downtify.forust.xyz`) - kind: Rule - middlewares: - - name: crowdsec-crowdsec-bouncer@kubernetescrd - - name: security-chain@file - services: - - name: downtify-service - port: 8000 - tls: - certResolver: letsencrypt + entryPoints: + - websecure + routes: + - match: Host(`downtify.forust.xyz`) + kind: Rule + middlewares: + - name: crowdsec-crowdsec-bouncer@kubernetescrd + - name: security-chain@file + services: + - name: downtify-service + port: 8000 + tls: + certResolver: letsencrypt --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: downtify-local - namespace: downtify + name: downtify-local + namespace: downtify spec: - entryPoints: - - websecure - routes: - - match: HostRegexp(`^downtify\.(workstation|gigaforust)\.internal$`) - kind: Rule - services: - - name: downtify-service - port: 8000 + entryPoints: + - websecure + routes: + - match: Host(`downtify.workstation.internal`) || Host(`downtify.gigaforust.internal`) + kind: Rule + services: + - name: downtify-service + port: 8000 diff --git a/gitea/k8s/ingress.yaml b/gitea/k8s/ingress.yaml index 5f66e18..d708b37 100644 --- a/gitea/k8s/ingress.yaml +++ b/gitea/k8s/ingress.yaml @@ -1,65 +1,64 @@ apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: gitea-prod - namespace: gitea + name: gitea-prod + namespace: gitea spec: - entryPoints: - - websecure - routes: - - match: Host(`gitea.forust.xyz`) - kind: Rule - middlewares: - - name: "crowdsec-crowdsec-bouncer@kubernetescrd" - services: - - name: gitea-service - port: 3000 - tls: - certResolver: letsencrypt + entryPoints: + - websecure + routes: + - match: Host(`gitea.forust.xyz`) + kind: Rule + middlewares: + - name: "crowdsec-crowdsec-bouncer@kubernetescrd" + services: + - name: gitea-service + port: 3000 + tls: + certResolver: letsencrypt --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: gitea-local - namespace: gitea + name: gitea-local + namespace: gitea spec: - entryPoints: - - websecure - routes: - - match: HostRegexp(`^gitea\.(workstation|gigaforust)\.internal$`) - kind: Rule - services: - - name: gitea-service - port: 3000 - + entryPoints: + - websecure + routes: + - match: Host(`gitea.workstation.internal`) || Host(`gitea.gigaforust.internal`) + kind: Rule + services: + - name: gitea-service + port: 3000 --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: gitea-registry - namespace: gitea + name: gitea-registry + namespace: gitea spec: - entryPoints: - - websecure - routes: - - match: Host(`gcr.forust.xyz`) && PathPrefix(`/v2`) - kind: Rule - services: - - name: gitea-service - port: 3000 - tls: - certResolver: letsencrypt + entryPoints: + - websecure + routes: + - match: Host(`gcr.forust.xyz`) && PathPrefix(`/v2`) + kind: Rule + services: + - name: gitea-service + port: 3000 + tls: + certResolver: letsencrypt --- apiVersion: traefik.io/v1alpha1 kind: IngressRouteTCP metadata: - name: gitea-ssh - namespace: gitea + name: gitea-ssh + namespace: gitea spec: - entryPoints: - - ssh - routes: - - match: HostSNI(`*`) - services: - - name: gitea-service - port: 2221 + entryPoints: + - ssh + routes: + - match: HostSNI(`*`) + services: + - name: gitea-service + port: 2221 diff --git a/glance/k8s/ingress.yaml b/glance/k8s/ingress.yaml index 6ce0bf1..2fe4ad0 100644 --- a/glance/k8s/ingress.yaml +++ b/glance/k8s/ingress.yaml @@ -27,7 +27,7 @@ spec: entryPoints: - websecure routes: - - match: HostRegexp(`^glance\.(workstation|gigaforust)\.internal$`) && PathPrefix(`/glance`) + - match: (Host(`glance.workstation.internal`) || Host(`glance.gigaforust.internal`)) && PathPrefix(`/glance`) kind: Rule middlewares: - name: glance-stripprefix diff --git a/headscale/k8s/ingress.yaml b/headscale/k8s/ingress.yaml index a3dfc2a..20dd9b0 100644 --- a/headscale/k8s/ingress.yaml +++ b/headscale/k8s/ingress.yaml @@ -1,57 +1,57 @@ apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: headscale-server-prod - namespace: headscale + name: headscale-server-prod + namespace: headscale spec: - entryPoints: - - websecure - routes: - - match: Host(`hs.forust.xyz`) - kind: Rule - middlewares: - - name: crowdsec-crowdsec-bouncer@kubernetescrd - services: - - name: headscale-server-external - port: 8080 - tls: - certResolver: letsencrypt + entryPoints: + - websecure + routes: + - match: Host(`hs.forust.xyz`) + kind: Rule + middlewares: + - name: crowdsec-crowdsec-bouncer@kubernetescrd + services: + - name: headscale-server-external + port: 8080 + tls: + certResolver: letsencrypt --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: headscale-server-local - namespace: headscale + name: headscale-server-local + namespace: headscale spec: - entryPoints: - - websecure - routes: - - match: HostRegexp(`^hs\.(workstation|gigaforust)\.internal$`) - kind: Rule - services: - - name: headscale-server-external - port: 8080 + entryPoints: + - websecure + routes: + - match: Host(`hs.workstation.internal`) || Host(`hs.gigaforust.internal`) + kind: Rule + services: + - name: headscale-server-external + port: 8080 --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: headscale-ui-prod - namespace: headscale + name: headscale-ui-prod + namespace: headscale spec: - entryPoints: - - websecure - routes: - - match: Host(`hs.forust.xyz`) && PathPrefix(`/admin`) - kind: Rule - middlewares: - - name: crowdsec-crowdsec-bouncer@kubernetescrd - - name: security-chain@file - services: - - name: headscale-ui-external - port: 80 - tls: - certResolver: letsencrypt + entryPoints: + - websecure + routes: + - match: Host(`hs.forust.xyz`) && PathPrefix(`/admin`) + kind: Rule + middlewares: + - name: crowdsec-crowdsec-bouncer@kubernetescrd + - name: security-chain@file + services: + - name: headscale-ui-external + port: 80 + tls: + certResolver: letsencrypt --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute diff --git a/homepages/k8s/ingress.yaml b/homepages/k8s/ingress.yaml index f0c82ef..39178b9 100644 --- a/homepages/k8s/ingress.yaml +++ b/homepages/k8s/ingress.yaml @@ -1,69 +1,69 @@ apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: forust-homepage-prod - namespace: homepages + name: forust-homepage-prod + namespace: homepages spec: - entryPoints: - - websecure - routes: - - match: Host(`forust.xyz`) || Host(`www.forust.xyz`) - kind: Rule - middlewares: - - name: crowdsec-crowdsec-bouncer@kubernetescrd - priority: 10 - services: - - name: forust-homepage-service - port: 80 - tls: - certResolver: letsencrypt + entryPoints: + - websecure + routes: + - match: Host(`forust.xyz`) || Host(`www.forust.xyz`) + kind: Rule + middlewares: + - name: crowdsec-crowdsec-bouncer@kubernetescrd + priority: 10 + services: + - name: forust-homepage-service + port: 80 + tls: + certResolver: letsencrypt --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: forust-homepage-local - namespace: homepages + name: forust-homepage-local + namespace: homepages spec: - entryPoints: - - websecure - routes: - - match: HostRegexp(`^landing\.(workstation|gigaforust)\.internal$`) - kind: Rule - priority: 10 - services: - - name: forust-homepage-service - port: 80 + entryPoints: + - websecure + routes: + - match: Host(`landing.workstation.internal`) || Host(`landing.gigaforust.internal`) + kind: Rule + priority: 10 + services: + - name: forust-homepage-service + port: 80 --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: xdfnx-homepage-prod - namespace: homepages + name: xdfnx-homepage-prod + namespace: homepages spec: - entryPoints: - - websecure - routes: - - match: Host(`xdfnx.cfd`) || Host(`www.xdfnx.cfd`) - kind: Rule - middlewares: - - name: crowdsec-crowdsec-bouncer@kubernetescrd - services: - - name: xdfnx-homepage-service - port: 80 - tls: - certResolver: letsencrypt + entryPoints: + - websecure + routes: + - match: Host(`xdfnx.cfd`) || Host(`www.xdfnx.cfd`) + kind: Rule + middlewares: + - name: crowdsec-crowdsec-bouncer@kubernetescrd + services: + - name: xdfnx-homepage-service + port: 80 + tls: + certResolver: letsencrypt --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: xdfnx-homepage-local - namespace: homepages + name: xdfnx-homepage-local + namespace: homepages spec: - entryPoints: - - websecure - routes: - - match: HostRegexp(`^xdfnx\.(workstation|gigaforust)\.internal$`) - kind: Rule - services: - - name: xdfnx-homepage-service - port: 80 + entryPoints: + - websecure + routes: + - match: Host(`xdfnx.workstation.internal`) || Host(`xdfnx.gigaforust.internal`) + kind: Rule + services: + - name: xdfnx-homepage-service + port: 80 diff --git a/kener/k8s/ingress.yaml b/kener/k8s/ingress.yaml index 76444e2..f2364e4 100644 --- a/kener/k8s/ingress.yaml +++ b/kener/k8s/ingress.yaml @@ -1,33 +1,33 @@ apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: kener-prod - namespace: kener + name: kener-prod + namespace: kener spec: - entryPoints: - - websecure - routes: - - match: Host(`status.forust.xyz`) - kind: Rule - middlewares: - - name: crowdsec-crowdsec-bouncer@kubernetescrd - services: - - name: kener-service - port: 3000 - tls: - certResolver: letsencrypt + entryPoints: + - websecure + routes: + - match: Host(`status.forust.xyz`) + kind: Rule + middlewares: + - name: crowdsec-crowdsec-bouncer@kubernetescrd + services: + - name: kener-service + port: 3000 + tls: + certResolver: letsencrypt --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: kener-local - namespace: kener + name: kener-local + namespace: kener spec: - entryPoints: - - websecure - routes: - - match: HostRegexp(`^status\.(workstation|gigaforust)\.internal$`) - kind: Rule - services: - - name: kener-service - port: 3000 + entryPoints: + - websecure + routes: + - match: Host(`status.workstation.internal`) || Host(`status.gigaforust.internal`) + kind: Rule + services: + - name: kener-service + port: 3000 diff --git a/metube/k8s/ingress.yaml b/metube/k8s/ingress.yaml index e70d510..380ae66 100644 --- a/metube/k8s/ingress.yaml +++ b/metube/k8s/ingress.yaml @@ -4,30 +4,30 @@ metadata: name: metube-prod namespace: metube spec: - entryPoints: - - websecure - routes: - - match: Host(`metube.forust.xyz`) - kind: Rule - middlewares: - - name: security-headers@file - services: - - name: metube-service - port: 8081 - tls: - certResolver: letsencrypt + entryPoints: + - websecure + routes: + - match: Host(`metube.forust.xyz`) + kind: Rule + middlewares: + - name: security-headers@file + services: + - name: metube-service + port: 8081 + tls: + certResolver: letsencrypt --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: metube-local - namespace: metube + name: metube-local + namespace: metube spec: - entryPoints: - - websecure - routes: - - match: HostRegexp(`^metube\.(workstation|gigaforust)\.internal$`) - kind: Rule - services: - - name: metube-service - port: 8081 + entryPoints: + - websecure + routes: + - match: Host(`metube.workstation.internal`) || Host(`metube.gigaforust.internal`) + kind: Rule + services: + - name: metube-service + port: 8081 diff --git a/n8n/k8s/ingress.yaml b/n8n/k8s/ingress.yaml index 8c26df7..cff0e84 100644 --- a/n8n/k8s/ingress.yaml +++ b/n8n/k8s/ingress.yaml @@ -1,33 +1,33 @@ apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: n8n-prod - namespace: n8n + name: n8n-prod + namespace: n8n spec: - entryPoints: - - websecure - routes: - - match: Host(`n8n.forust.xyz`) - kind: Rule - middlewares: - - name: "crowdsec-crowdsec-bouncer@kubernetescrd" - services: - - name: n8n-service - port: 5678 - tls: - certResolver: letsencrypt + entryPoints: + - websecure + routes: + - match: Host(`n8n.forust.xyz`) + kind: Rule + middlewares: + - name: "crowdsec-crowdsec-bouncer@kubernetescrd" + services: + - name: n8n-service + port: 5678 + tls: + certResolver: letsencrypt --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: n8n-local - namespace: n8n + name: n8n-local + namespace: n8n spec: - entryPoints: - - websecure - routes: - - match: HostRegexp(`^n8n\.(workstation|gigaforust)\.internal$`) - kind: Rule - services: - - name: n8n-service - port: 5678 + entryPoints: + - websecure + routes: + - match: Host(`n8n.workstation.internal`) || Host(`n8n.gigaforust.internal`) + kind: Rule + services: + - name: n8n-service + port: 5678 diff --git a/netronome/k8s/ingress.yaml b/netronome/k8s/ingress.yaml index c05eed4..6cb85bb 100644 --- a/netronome/k8s/ingress.yaml +++ b/netronome/k8s/ingress.yaml @@ -1,33 +1,33 @@ apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: netronome-prod - namespace: netronome + name: netronome-prod + namespace: netronome spec: - entryPoints: - - websecure - routes: - - match: Host(`nm.forust.xyz`) - kind: Rule - middlewares: - - name: "crowdsec-crowdsec-bouncer@kubernetescrd" - services: - - name: netronome-service - port: 7575 - tls: - certResolver: letsencrypt + entryPoints: + - websecure + routes: + - match: Host(`nm.forust.xyz`) + kind: Rule + middlewares: + - name: "crowdsec-crowdsec-bouncer@kubernetescrd" + services: + - name: netronome-service + port: 7575 + tls: + certResolver: letsencrypt --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: netronome-local - namespace: netronome + name: netronome-local + namespace: netronome spec: - entryPoints: - - websecure - routes: - - match: HostRegexp(`^nm\.(workstation|gigaforust)\.internal$`) - kind: Rule - services: - - name: netronome-service - port: 7575 + entryPoints: + - websecure + routes: + - match: Host(`nm.workstation.internal`) || Host(`nm.gigaforust.internal`) + kind: Rule + services: + - name: netronome-service + port: 7575 diff --git a/nextcloud/k8s/ingress.yaml b/nextcloud/k8s/ingress.yaml index 63f332e..62f140c 100644 --- a/nextcloud/k8s/ingress.yaml +++ b/nextcloud/k8s/ingress.yaml @@ -28,7 +28,7 @@ spec: entryPoints: - websecure routes: - - match: HostRegexp(`^nextcloud\.(workstation|gigaforust)\.internal$`) + - match: Host(`nextcloud.workstation.internal`) || Host(`nextcloud.gigaforust.internal`) kind: Rule middlewares: - name: "crowdsec-crowdsec-bouncer@kubernetescrd" @@ -36,8 +36,6 @@ spec: services: - name: nextcloud-apache port: 11000 - - # --- # Nextcloud AIO # apiVersion: traefik.io/v1alpha1 @@ -68,7 +66,7 @@ spec: entryPoints: - websecure routes: - - match: HostRegexp(`^naio\.(workstation|gigaforust)\.internal$`) + - match: Host(`naio.workstation.internal`) || Host(`naio.gigaforust.internal`) kind: Rule services: - name: nextcloud-aio diff --git a/portainer/k8s/ingress.yaml b/portainer/k8s/ingress.yaml index 7d7a59a..f1acace 100644 --- a/portainer/k8s/ingress.yaml +++ b/portainer/k8s/ingress.yaml @@ -26,7 +26,7 @@ spec: entryPoints: - websecure routes: - - match: HostRegexp(`^portainer\.(workstation|gigaforust)\.internal$`) + - match: Host(`portainer.workstation.internal`) || Host(`portainer.gigaforust.internal`) kind: Rule services: - name: portainer-service diff --git a/prometheus-stack/k8s/ingress.yaml b/prometheus-stack/k8s/ingress.yaml index 83893db..a516d0e 100644 --- a/prometheus-stack/k8s/ingress.yaml +++ b/prometheus-stack/k8s/ingress.yaml @@ -1,36 +1,36 @@ apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: grafana-prod - namespace: prometheus + name: grafana-prod + namespace: prometheus spec: - entryPoints: - - websecure - routes: - - match: Host(`grafana.forust.xyz`) - kind: Rule - middlewares: - - name: "crowdsec-crowdsec-bouncer@kubernetescrd" - - name: "security-chain@file" - services: - - name: prometheus-stack-grafana - port: 80 - tls: - certResolver: letsencrypt - domains: - - main: grafana.forust.xyz + entryPoints: + - websecure + routes: + - match: Host(`grafana.forust.xyz`) + kind: Rule + middlewares: + - name: "crowdsec-crowdsec-bouncer@kubernetescrd" + - name: "security-chain@file" + services: + - name: prometheus-stack-grafana + port: 80 + tls: + certResolver: letsencrypt + domains: + - main: grafana.forust.xyz --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: grafana-local - namespace: prometheus + name: grafana-local + namespace: prometheus spec: - entryPoints: - - websecure - routes: - - match: HostRegexp(`^grafana\.(workstation|gigaforust)\.internal$`) - kind: Rule - services: - - name: prometheus-stack-grafana - port: 80 + entryPoints: + - websecure + routes: + - match: Host(`grafana.workstation.internal`) || Host(`grafana.gigaforust.internal`) + kind: Rule + services: + - name: prometheus-stack-grafana + port: 80 diff --git a/searxng/k8s/ingress.yaml b/searxng/k8s/ingress.yaml index 86c834e..5c598f8 100644 --- a/searxng/k8s/ingress.yaml +++ b/searxng/k8s/ingress.yaml @@ -26,7 +26,7 @@ spec: entryPoints: - websecure routes: - - match: HostRegexp(`^(s|searxng)\.(workstation|gigaforust)\.internal$`) + - match: Host(`s.workstation.internal`) || Host(`searxng.workstation.internal`) || Host(`s.gigaforust.internal`) || Host(`searxng.gigaforust.internal`) kind: Rule services: - name: searxng-service diff --git a/termix/k8s/ingress.yaml b/termix/k8s/ingress.yaml index dcd5310..abe72ee 100644 --- a/termix/k8s/ingress.yaml +++ b/termix/k8s/ingress.yaml @@ -26,7 +26,7 @@ spec: entryPoints: - websecure routes: - - match: HostRegexp(`^termix\.(workstation|gigaforust)\.internal$`) + - match: Host(`termix.workstation.internal`) || Host(`termix.gigaforust.internal`) kind: Rule services: - name: termix-service diff --git a/traefik/k8s/ingress.yaml b/traefik/k8s/ingress.yaml index b3b531d..e957454 100644 --- a/traefik/k8s/ingress.yaml +++ b/traefik/k8s/ingress.yaml @@ -27,7 +27,7 @@ spec: entryPoints: - websecure routes: - - match: HostRegexp(`^traefik\.(workstation|gigaforust)\.internal$`) + - match: Host(`traefik.workstation.internal`) || Host(`traefik.gigaforust.internal`) kind: Rule services: - name: api@internal diff --git a/uptime-kuma/k8s/ingress.yaml b/uptime-kuma/k8s/ingress.yaml index 8126226..189dfd7 100644 --- a/uptime-kuma/k8s/ingress.yaml +++ b/uptime-kuma/k8s/ingress.yaml @@ -26,7 +26,7 @@ spec: entryPoints: - websecure routes: - - match: HostRegexp(`^uptime\.(workstation|gigaforust)\.internal$`) + - match: Host(`uptime.workstation.internal`) || Host(`uptime.gigaforust.internal`) kind: Rule services: - name: uptime-kuma-service