diff --git a/apps/media/jellyfin/ingress.yaml b/apps/media/jellyfin/ingress.yaml deleted file mode 100644 index 9fd0037..0000000 --- a/apps/media/jellyfin/ingress.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: traefik.io/v1alpha1 -kind: IngressRoute -metadata: - name: jellyfin-ingress -spec: - entryPoints: - - websecure - routes: - - match: Host(`jellyfin.stonegarden.dev`) - kind: Rule - services: - - name: jellyfin-svc - port: 8096 \ No newline at end of file diff --git a/apps/media/jellyfin/kustomization.yaml b/apps/media/jellyfin/kustomization.yaml index 8aa9315..f9e6e79 100644 --- a/apps/media/jellyfin/kustomization.yaml +++ b/apps/media/jellyfin/kustomization.yaml @@ -19,5 +19,4 @@ resources: - pvc-jellyfin-media.yaml - service.yaml - deployment.yaml -# - ingress.yaml - http-route.yaml diff --git a/apps/media/plex/ingress.yaml b/apps/media/plex/ingress.yaml deleted file mode 100644 index 9c94006..0000000 --- a/apps/media/plex/ingress.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: traefik.io/v1alpha1 -kind: IngressRoute -metadata: - name: ingressroute-plex -spec: - entryPoints: - - websecure - routes: - - match: Host(`plex.stonegarden.dev`) - kind: Rule - services: - - name: plex - port: 32400 \ No newline at end of file diff --git a/apps/media/plex/kustomization.yaml b/apps/media/plex/kustomization.yaml index a32000d..50d518b 100644 --- a/apps/media/plex/kustomization.yaml +++ b/apps/media/plex/kustomization.yaml @@ -19,5 +19,4 @@ resources: - pvc-plex-media.yaml - service.yaml - deployment.yaml -# - ingress.yaml - http-route.yaml diff --git a/apps/public/blog/remark42/ingress-route.yaml b/apps/public/blog/remark42/ingress-route.yaml deleted file mode 100644 index 58fee16..0000000 --- a/apps/public/blog/remark42/ingress-route.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: traefik.io/v1alpha1 -kind: IngressRoute -metadata: - name: remark42 - namespace: blog -spec: - entryPoints: - - websecure - routes: - - match: Host(`remark42.stonegarden.dev`) - kind: Rule - services: - - name: remark42-web - port: http \ No newline at end of file diff --git a/apps/public/blog/remark42/kustomization.yaml b/apps/public/blog/remark42/kustomization.yaml index 9d66064..dcb427e 100644 --- a/apps/public/blog/remark42/kustomization.yaml +++ b/apps/public/blog/remark42/kustomization.yaml @@ -11,7 +11,6 @@ configMapGenerator: resources: - deployment.yaml -# - ingress-route.yaml - http-route.yaml - pv.yaml - pvc.yaml diff --git a/apps/public/blog/values.yaml b/apps/public/blog/values.yaml index e0a68aa..da2f435 100644 --- a/apps/public/blog/values.yaml +++ b/apps/public/blog/values.yaml @@ -8,5 +8,7 @@ env: value: Europe/Oslo service: containerPort: 80 +ingressRoute: + create: false auth: enabled: false \ No newline at end of file diff --git a/apps/public/stonegarden/ingress.yaml b/apps/public/stonegarden/ingress.yaml deleted file mode 100644 index 9a0057b..0000000 --- a/apps/public/stonegarden/ingress.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: traefik.io/v1alpha1 -kind: IngressRoute -metadata: - name: stonegarden -spec: - entryPoints: - - websecure - routes: - - match: Host(`stonegarden.dev`) || Host(`www.stonegarden.dev`) - kind: Rule - services: - - name: stonegarden - port: web \ No newline at end of file diff --git a/apps/public/stonegarden/kustomization.yaml b/apps/public/stonegarden/kustomization.yaml index e050d6e..6498143 100644 --- a/apps/public/stonegarden/kustomization.yaml +++ b/apps/public/stonegarden/kustomization.yaml @@ -8,5 +8,4 @@ resources: - ns.yaml - service.yaml - deployment.yaml -# - ingress.yaml - http-route.yaml diff --git a/apps/utility/home-assistant/http-route.yaml b/apps/utility/home-assistant/http-route.yaml new file mode 100644 index 0000000..4efcea7 --- /dev/null +++ b/apps/utility/home-assistant/http-route.yaml @@ -0,0 +1,18 @@ +apiVersion: gateway.networking.k8s.io/v1 +kind: HTTPRoute +metadata: + name: hass-http-route +spec: + parentRefs: + - name: cilium-gateway + namespace: gateway + hostnames: + - "hass.stonegarden.dev" + rules: + - matches: + - path: + type: PathPrefix + value: / + backendRefs: + - name: home-assistant + port: 8123 \ No newline at end of file diff --git a/apps/utility/home-assistant/ingress.yaml b/apps/utility/home-assistant/ingress.yaml deleted file mode 100644 index 05b3c46..0000000 --- a/apps/utility/home-assistant/ingress.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: traefik.io/v1alpha1 -kind: IngressRoute -metadata: - name: home-assistant -spec: - entryPoints: - - websecure - routes: - - match: Host(`hass.stonegarden.dev`) - kind: Rule - services: - - name: home-assistant - port: 8123 \ No newline at end of file diff --git a/apps/utility/home-assistant/kustomization.yaml b/apps/utility/home-assistant/kustomization.yaml index e32bd9b..1c7d9ce 100644 --- a/apps/utility/home-assistant/kustomization.yaml +++ b/apps/utility/home-assistant/kustomization.yaml @@ -9,4 +9,4 @@ resources: - pvc-hass-config.yaml - service.yaml - deployment.yaml - - ingress.yaml + - http-route.yaml diff --git a/infra/gateway/kustomization.yaml b/infra/gateway/kustomization.yaml index 3c5d5d7..1779f0c 100644 --- a/infra/gateway/kustomization.yaml +++ b/infra/gateway/kustomization.yaml @@ -3,7 +3,6 @@ kind: Kustomization resources: - https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.0.0/experimental-install.yaml -# - https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.0.0/standard-install.yaml - gateway-class.yaml - ns.yaml - cloudflare-api-token.yaml diff --git a/infra/net-aux/config/cloudflared/config.yaml b/infra/net-aux/config/cloudflared/config.yaml index 585a99a..1fb088d 100644 --- a/infra/net-aux/config/cloudflared/config.yaml +++ b/infra/net-aux/config/cloudflared/config.yaml @@ -31,9 +31,12 @@ ingress: service: https://cilium-gateway-cilium-gateway.gateway.svc.cluster.local:443 originRequest: originServerName: gateway.stonegarden.dev + - hostname: hass.stonegarden.dev + service: https://cilium-gateway-cilium-gateway.gateway.svc.cluster.local:443 + originRequest: + originServerName: hass.stonegarden.dev - hostname: stonegarden.dev service: https://cilium-gateway-cilium-gateway.gateway.svc.cluster.local:443 - #service: https://traefik.traefik.svc.cluster.local:443 originRequest: originServerName: stonegarden.dev - hostname: "*.stonegarden.dev"