diff --git a/apps/media/jellyfin/http-route.yaml b/apps/media/jellyfin/http-route.yaml index 99e47cd..9f7d71b 100644 --- a/apps/media/jellyfin/http-route.yaml +++ b/apps/media/jellyfin/http-route.yaml @@ -14,5 +14,5 @@ spec: type: PathPrefix value: / backendRefs: - - name: jellyfin-svc + - name: jellyfin port: 8096 \ No newline at end of file diff --git a/apps/media/jellyfin/ingress-route.yaml b/apps/media/jellyfin/ingress-route.yaml new file mode 100644 index 0000000..d81d639 --- /dev/null +++ b/apps/media/jellyfin/ingress-route.yaml @@ -0,0 +1,14 @@ +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute +metadata: + name: jellyfin + namespace: jellyfin +spec: + entryPoints: + - websecure + routes: + - match: Host(`jellyfin.stonegarden.dev`) + kind: Rule + services: + - name: jellyfin + port: 8096 \ No newline at end of file diff --git a/apps/media/jellyfin/kustomization.yaml b/apps/media/jellyfin/kustomization.yaml index f9e6e79..e64b634 100644 --- a/apps/media/jellyfin/kustomization.yaml +++ b/apps/media/jellyfin/kustomization.yaml @@ -20,3 +20,4 @@ resources: - service.yaml - deployment.yaml - http-route.yaml + - ingress-route.yaml diff --git a/apps/media/jellyfin/service.yaml b/apps/media/jellyfin/service.yaml index 239bd88..52c0aa5 100644 --- a/apps/media/jellyfin/service.yaml +++ b/apps/media/jellyfin/service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: jellyfin-svc + name: jellyfin namespace: jellyfin spec: selector: diff --git a/apps/public/blog/http-route.yaml b/apps/public/blog/http-route.yaml index 125e03e..004e7c8 100644 --- a/apps/public/blog/http-route.yaml +++ b/apps/public/blog/http-route.yaml @@ -1,7 +1,8 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: blog-http-route + name: blog + namespace: blog spec: parentRefs: - name: stonegarden diff --git a/apps/public/blog/remark42/http-route.yaml b/apps/public/blog/remark42/http-route.yaml index 27d9c97..d30a4b9 100644 --- a/apps/public/blog/remark42/http-route.yaml +++ b/apps/public/blog/remark42/http-route.yaml @@ -2,6 +2,7 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: name: remark42-http-route + namespace: blog spec: parentRefs: - name: stonegarden @@ -14,5 +15,5 @@ spec: type: PathPrefix value: / backendRefs: - - name: remark42-web + - name: remark42 port: 80 \ No newline at end of file diff --git a/apps/public/blog/remark42/ingress-route.yaml b/apps/public/blog/remark42/ingress-route.yaml new file mode 100644 index 0000000..960da53 --- /dev/null +++ b/apps/public/blog/remark42/ingress-route.yaml @@ -0,0 +1,14 @@ +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 + port: 80 \ No newline at end of file diff --git a/apps/public/blog/remark42/kustomization.yaml b/apps/public/blog/remark42/kustomization.yaml index dcb427e..161aa93 100644 --- a/apps/public/blog/remark42/kustomization.yaml +++ b/apps/public/blog/remark42/kustomization.yaml @@ -1,6 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: blog + commonLabels: app.kubernetes.io/managed-by: argocd @@ -17,4 +17,5 @@ resources: - secret-github.yaml - secret-google.yaml - secret-remark42.yaml - - service.yaml \ No newline at end of file + - service.yaml + - ingress-route.yaml \ No newline at end of file diff --git a/apps/public/blog/remark42/service.yaml b/apps/public/blog/remark42/service.yaml index d6aa7ca..3774d89 100644 --- a/apps/public/blog/remark42/service.yaml +++ b/apps/public/blog/remark42/service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: remark42-web + name: remark42 namespace: blog spec: selector: diff --git a/apps/public/stonegarden/ingress-route.yaml b/apps/public/stonegarden/ingress-route.yaml new file mode 100644 index 0000000..b6aa687 --- /dev/null +++ b/apps/public/stonegarden/ingress-route.yaml @@ -0,0 +1,14 @@ +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute +metadata: + name: stonegarden + namespace: stonegarden +spec: + entryPoints: + - websecure + routes: + - match: Host(`stonegarden.dev`) + kind: Rule + services: + - name: stonegarden + port: 3000 \ No newline at end of file diff --git a/apps/public/stonegarden/kustomization.yaml b/apps/public/stonegarden/kustomization.yaml index 6d9e15c..203d7e4 100644 --- a/apps/public/stonegarden/kustomization.yaml +++ b/apps/public/stonegarden/kustomization.yaml @@ -9,3 +9,4 @@ resources: - service.yaml - deployment.yaml - http-route.yaml + - ingress-route.yaml diff --git a/apps/utility/haos/endpoint-slice.yaml b/apps/utility/haos/endpoint-slice.yaml index a06fa12..bb6287d 100644 --- a/apps/utility/haos/endpoint-slice.yaml +++ b/apps/utility/haos/endpoint-slice.yaml @@ -15,4 +15,21 @@ endpoints: - addresses: - 192.168.1.27 conditions: # https://github.com/argoproj/argo-cd/issues/15554 - ready: true \ No newline at end of file + ready: true +--- +# Traefik uses Endpoints instead of EndpointSlice +apiVersion: v1 +kind: Endpoints +metadata: + name: home-assistant + namespace: haos + labels: + kubernetes.io/service-name: home-assistant + endpoints.kubernetes.io/managed-by: cluster-admins +subsets: + - addresses: + - ip: 192.168.1.27 + ports: + - name: http + port: 8123 + protocol: TCP diff --git a/apps/utility/haos/http-route.yaml b/apps/utility/haos/http-route.yaml index 632d894..4c73d64 100644 --- a/apps/utility/haos/http-route.yaml +++ b/apps/utility/haos/http-route.yaml @@ -16,4 +16,4 @@ spec: value: / backendRefs: - name: home-assistant - port: 80 \ No newline at end of file + port: 8123 \ No newline at end of file diff --git a/apps/utility/haos/ingress-route.yaml b/apps/utility/haos/ingress-route.yaml new file mode 100644 index 0000000..432b7bd --- /dev/null +++ b/apps/utility/haos/ingress-route.yaml @@ -0,0 +1,14 @@ +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute +metadata: + name: home-assistant + namespace: haos +spec: + entryPoints: + - websecure + routes: + - match: Host(`haos.stonegarden.dev`) + kind: Rule + services: + - name: home-assistant + port: 8123 \ No newline at end of file diff --git a/apps/utility/haos/kustomization.yaml b/apps/utility/haos/kustomization.yaml index ea2cdd2..ab49144 100644 --- a/apps/utility/haos/kustomization.yaml +++ b/apps/utility/haos/kustomization.yaml @@ -5,4 +5,5 @@ resources: - ns.yaml - svc.yaml - endpoint-slice.yaml - - http-route.yaml \ No newline at end of file + - http-route.yaml + - ingress-route.yaml \ No newline at end of file diff --git a/apps/utility/haos/svc.yaml b/apps/utility/haos/svc.yaml index a230ce7..b36eaf0 100644 --- a/apps/utility/haos/svc.yaml +++ b/apps/utility/haos/svc.yaml @@ -7,5 +7,4 @@ spec: ports: - name: http protocol: TCP - port: 80 - targetPort: 8123 \ No newline at end of file + port: 8123 \ No newline at end of file diff --git a/infra/net-aux/config/cloudflared/config.yaml b/infra/net-aux/config/cloudflared/config.yaml index 64c5e7e..3260be2 100644 --- a/infra/net-aux/config/cloudflared/config.yaml +++ b/infra/net-aux/config/cloudflared/config.yaml @@ -15,22 +15,22 @@ ingress: service: https://cilium-gateway-proxmox-euclid.gateway.svc.cluster.local:443 originRequest: originServerName: proxmox.euclid.stonegarden.dev - - hostname: haos.stonegarden.dev - service: https://cilium-gateway-stonegarden.gateway.svc.cluster.local:443 - originRequest: - originServerName: haos.stonegarden.dev - - hostname: blog.stonegarden.dev - service: https://cilium-gateway-stonegarden.gateway.svc.cluster.local:443 - originRequest: - originServerName: blog.stonegarden.dev +# - hostname: haos.stonegarden.dev +# service: https://cilium-gateway-stonegarden.gateway.svc.cluster.local:443 +# originRequest: +# originServerName: haos.stonegarden.dev +# - hostname: blog.stonegarden.dev +# service: https://cilium-gateway-stonegarden.gateway.svc.cluster.local:443 +# originRequest: +# originServerName: blog.stonegarden.dev +# - hostname: remark42.stonegarden.dev +# service: https://cilium-gateway-stonegarden.gateway.svc.cluster.local:443 +# originRequest: +# originServerName: remark42.stonegarden.dev - hostname: gateway.stonegarden.dev service: https://cilium-gateway-stonegarden.gateway.svc.cluster.local:443 originRequest: originServerName: gateway.stonegarden.dev - - hostname: remark42.stonegarden.dev - service: https://cilium-gateway-stonegarden.gateway.svc.cluster.local:443 - originRequest: - originServerName: remark42.stonegarden.dev - hostname: stonegarden.dev service: https://cilium-gateway-stonegarden.gateway.svc.cluster.local:443 originRequest: diff --git a/infra/net-aux/config/pi-hole/02-custom.conf b/infra/net-aux/config/pi-hole/02-custom.conf index bac6bdf..75dd2fb 100644 --- a/infra/net-aux/config/pi-hole/02-custom.conf +++ b/infra/net-aux/config/pi-hole/02-custom.conf @@ -1,9 +1,9 @@ #address=/stonegarden.dev/192.168.1.142 -address=/blog.stonegarden.dev/192.168.1.172 -address=/gateway.stonegarden.dev/192.168.1.172 -address=/hass.stonegarden.dev/192.168.1.172 -address=/jellyfin.stonegarden.dev/192.168.1.172 +#address=/blog.stonegarden.dev/192.168.1.172 +#address=/gateway.stonegarden.dev/192.168.1.172 +#address=/hass.stonegarden.dev/192.168.1.172 +address=/jellyfin.stonegarden.dev/192.168.1.142 address=/plex.stonegarden.dev/192.168.1.142 -address=/postgres.stonegarden.dev/192.168.1.172 -address=/remark42.stonegarden.dev/192.168.1.172 +#address=/postgres.stonegarden.dev/192.168.1.172 +#address=/remark42.stonegarden.dev/192.168.1.172 edns-packet-max=1232 diff --git a/infra/pi-hole/config/02-custom.conf b/infra/pi-hole/config/02-custom.conf index bac6bdf..75dd2fb 100644 --- a/infra/pi-hole/config/02-custom.conf +++ b/infra/pi-hole/config/02-custom.conf @@ -1,9 +1,9 @@ #address=/stonegarden.dev/192.168.1.142 -address=/blog.stonegarden.dev/192.168.1.172 -address=/gateway.stonegarden.dev/192.168.1.172 -address=/hass.stonegarden.dev/192.168.1.172 -address=/jellyfin.stonegarden.dev/192.168.1.172 +#address=/blog.stonegarden.dev/192.168.1.172 +#address=/gateway.stonegarden.dev/192.168.1.172 +#address=/hass.stonegarden.dev/192.168.1.172 +address=/jellyfin.stonegarden.dev/192.168.1.142 address=/plex.stonegarden.dev/192.168.1.142 -address=/postgres.stonegarden.dev/192.168.1.172 -address=/remark42.stonegarden.dev/192.168.1.172 +#address=/postgres.stonegarden.dev/192.168.1.172 +#address=/remark42.stonegarden.dev/192.168.1.172 edns-packet-max=1232