diff --git a/apps/media/jellyfin/http-route.yaml b/apps/media/jellyfin/http-route.yaml index 02e41b5..4d6da71 100644 --- a/apps/media/jellyfin/http-route.yaml +++ b/apps/media/jellyfin/http-route.yaml @@ -1,7 +1,7 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: jellyfin-http-route + name: jellyfin spec: parentRefs: - name: cilium-gateway diff --git a/apps/media/jellyfin/kustomization.yaml b/apps/media/jellyfin/kustomization.yaml index 6b827fc..8aa9315 100644 --- a/apps/media/jellyfin/kustomization.yaml +++ b/apps/media/jellyfin/kustomization.yaml @@ -19,5 +19,5 @@ resources: - pvc-jellyfin-media.yaml - service.yaml - deployment.yaml - - ingress.yaml +# - ingress.yaml - http-route.yaml diff --git a/apps/media/plex/kustomization.yaml b/apps/media/plex/kustomization.yaml index 826c539..a32000d 100644 --- a/apps/media/plex/kustomization.yaml +++ b/apps/media/plex/kustomization.yaml @@ -19,5 +19,5 @@ resources: - pvc-plex-media.yaml - service.yaml - deployment.yaml - - ingress.yaml +# - ingress.yaml - http-route.yaml diff --git a/apps/public/blog/http-route.yaml b/apps/public/blog/http-route.yaml new file mode 100644 index 0000000..4bf2da0 --- /dev/null +++ b/apps/public/blog/http-route.yaml @@ -0,0 +1,18 @@ +apiVersion: gateway.networking.k8s.io/v1 +kind: HTTPRoute +metadata: + name: blog-http-route +spec: + parentRefs: + - name: cilium-gateway + namespace: gateway + hostnames: + - "blog.stonegarden.dev" + rules: + - matches: + - path: + type: PathPrefix + value: / + backendRefs: + - name: blog + port: 80 \ No newline at end of file diff --git a/apps/public/blog/kustomization.yaml b/apps/public/blog/kustomization.yaml index 0a3fd35..354d2f8 100644 --- a/apps/public/blog/kustomization.yaml +++ b/apps/public/blog/kustomization.yaml @@ -6,6 +6,7 @@ commonLabels: resources: - remark42 + - http-route.yaml helmGlobals: chartHome: ../../../charts diff --git a/apps/public/blog/remark42/http-route.yaml b/apps/public/blog/remark42/http-route.yaml new file mode 100644 index 0000000..77c8471 --- /dev/null +++ b/apps/public/blog/remark42/http-route.yaml @@ -0,0 +1,18 @@ +apiVersion: gateway.networking.k8s.io/v1 +kind: HTTPRoute +metadata: + name: remark42-http-route +spec: + parentRefs: + - name: cilium-gateway + namespace: gateway + hostnames: + - "remark42.stonegarden.dev" + rules: + - matches: + - path: + type: PathPrefix + value: / + backendRefs: + - name: remark42-web + 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 1c84554..9d66064 100644 --- a/apps/public/blog/remark42/kustomization.yaml +++ b/apps/public/blog/remark42/kustomization.yaml @@ -11,7 +11,8 @@ configMapGenerator: resources: - deployment.yaml - - ingress-route.yaml +# - ingress-route.yaml + - http-route.yaml - pv.yaml - pvc.yaml - secret-github.yaml diff --git a/apps/public/stonegarden/http-route.yaml b/apps/public/stonegarden/http-route.yaml new file mode 100644 index 0000000..34a7e8d --- /dev/null +++ b/apps/public/stonegarden/http-route.yaml @@ -0,0 +1,18 @@ +apiVersion: gateway.networking.k8s.io/v1 +kind: HTTPRoute +metadata: + name: jellyfin-http-route +spec: + parentRefs: + - name: cilium-gateway + namespace: gateway + hostnames: + - "stonegarden.dev" + rules: + - matches: + - path: + type: PathPrefix + value: / + backendRefs: + - 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 b717688..e050d6e 100644 --- a/apps/public/stonegarden/kustomization.yaml +++ b/apps/public/stonegarden/kustomization.yaml @@ -5,6 +5,8 @@ commonLabels: app: stonegarden resources: + - ns.yaml - service.yaml - deployment.yaml - - ingress.yaml +# - ingress.yaml + - http-route.yaml diff --git a/apps/public/stonegarden/ns.yaml b/apps/public/stonegarden/ns.yaml new file mode 100644 index 0000000..e1079e3 --- /dev/null +++ b/apps/public/stonegarden/ns.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: stonegarden + labels: + dev.stonegarden.app: homepage \ No newline at end of file diff --git a/apps/test/whoami/kustomization.yaml b/apps/test/whoami/kustomization.yaml index dcef2c6..7352646 100644 --- a/apps/test/whoami/kustomization.yaml +++ b/apps/test/whoami/kustomization.yaml @@ -3,9 +3,8 @@ kind: Kustomization namespace: whoami resources: -# - issuer.yaml # - ingress.yaml - - ingress-route.yaml +# - ingress-route.yaml - http-route.yaml - traefik-forward-auth - whoami \ No newline at end of file diff --git a/infra/cilium/kustomization.yaml b/infra/cilium/kustomization.yaml index 8a7adca..4406217 100644 --- a/infra/cilium/kustomization.yaml +++ b/infra/cilium/kustomization.yaml @@ -11,7 +11,8 @@ resources: helmCharts: - name: cilium repo: https://helm.cilium.io - version: 1.14.5 + version: 1.15.0-rc.0 releaseName: "cilium" + includeCRDs: true namespace: kube-system valuesFile: values.yaml \ No newline at end of file diff --git a/infra/cilium/values.yaml b/infra/cilium/values.yaml index 883baae..51efb13 100644 --- a/infra/cilium/values.yaml +++ b/infra/cilium/values.yaml @@ -18,9 +18,6 @@ rollOutCiliumPods: true #debug: # enabled: true -image: - tag: "v1.15.0-rc.0" - # Increase rate limit when doing L2 announcements k8sClientRateLimit: qps: 100 diff --git a/infra/gateway/gateway.yaml b/infra/gateway/gateway.yaml index 96e9694..8ea00b7 100644 --- a/infra/gateway/gateway.yaml +++ b/infra/gateway/gateway.yaml @@ -5,16 +5,11 @@ metadata: namespace: gateway annotations: cert-manager.io/issuer: cloudflare-issuer - io.cilium/lb-ipam-ips: 192.168.1.172 spec: gatewayClassName: cilium infrastructure: - labels: - test-label: test-label annotations: io.cilium/lb-ipam-ips: 192.168.1.172 - addresses: - - value: 192.168.1.172 listeners: - protocol: HTTPS port: 443 @@ -26,4 +21,21 @@ spec: name: cloudflare-cert allowedRoutes: namespaces: - from: All \ No newline at end of file + from: All + - protocol: HTTPS + port: 443 + name: https-domain-gateway + hostname: stonegarden.dev + tls: + certificateRefs: + - kind: Secret + name: cloudflare-domain-cert + allowedRoutes: + namespaces: + from: All +# allowedRoutes: +# namespaces: +# from: Selector +# selector: +# matchLabels: +# dev.stonegarden.app: homepage \ No newline at end of file diff --git a/infra/gateway/kustomization.yaml b/infra/gateway/kustomization.yaml index 1779f0c..3c5d5d7 100644 --- a/infra/gateway/kustomization.yaml +++ b/infra/gateway/kustomization.yaml @@ -3,6 +3,7 @@ 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 9dd3b83..585a99a 100644 --- a/infra/net-aux/config/cloudflared/config.yaml +++ b/infra/net-aux/config/cloudflared/config.yaml @@ -19,16 +19,25 @@ ingress: - aud1 d34ec64c62e56195ac6158dbfbeae62155d110f5c3a3b7e949572916dc57a6f3 - hostname: ssh.stonegarden.dev service: ssh://192.168.1.12:22 + - hostname: blog.stonegarden.dev + service: https://cilium-gateway-cilium-gateway.gateway.svc.cluster.local:443 + originRequest: + originServerName: blog.stonegarden.dev + - hostname: remark42.stonegarden.dev + service: https://cilium-gateway-cilium-gateway.gateway.svc.cluster.local:443 + originRequest: + originServerName: remark42.stonegarden.dev - hostname: gateway.stonegarden.dev service: https://cilium-gateway-cilium-gateway.gateway.svc.cluster.local:443 originRequest: - originServerName: "*.stonegarden.dev" + originServerName: gateway.stonegarden.dev - hostname: stonegarden.dev - service: https://traefik.traefik.svc.cluster.local:443 + service: https://cilium-gateway-cilium-gateway.gateway.svc.cluster.local:443 + #service: https://traefik.traefik.svc.cluster.local:443 originRequest: - originServerName: "*.stonegarden.dev" + originServerName: stonegarden.dev - hostname: "*.stonegarden.dev" service: https://traefik.traefik.svc.cluster.local:443 originRequest: - originServerName: stonegarden.dev + originServerName: "*.stonegarden.dev" - service: http_status:404 diff --git a/infra/net-aux/config/pi-hole/02-custom.conf b/infra/net-aux/config/pi-hole/02-custom.conf index 6afe3f5..c7b4f90 100644 --- a/infra/net-aux/config/pi-hole/02-custom.conf +++ b/infra/net-aux/config/pi-hole/02-custom.conf @@ -1,5 +1,5 @@ address=/stonegarden.dev/192.168.1.142 -address=/gateway.stonegarden.dev/192.168.1.219 -address=/jellyfin.stonegarden.dev/192.168.1.219 -address=/plex.stonegarden.dev/192.168.1.219 +address=/gateway.stonegarden.dev/192.168.1.172 +address=/jellyfin.stonegarden.dev/192.168.1.172 +address=/plex.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 6afe3f5..c7b4f90 100644 --- a/infra/pi-hole/config/02-custom.conf +++ b/infra/pi-hole/config/02-custom.conf @@ -1,5 +1,5 @@ address=/stonegarden.dev/192.168.1.142 -address=/gateway.stonegarden.dev/192.168.1.219 -address=/jellyfin.stonegarden.dev/192.168.1.219 -address=/plex.stonegarden.dev/192.168.1.219 +address=/gateway.stonegarden.dev/192.168.1.172 +address=/jellyfin.stonegarden.dev/192.168.1.172 +address=/plex.stonegarden.dev/192.168.1.172 edns-packet-max=1232