diff --git a/apps/jellyfin/service.yaml b/apps/jellyfin/service.yaml index 5ce7126..239bd88 100644 --- a/apps/jellyfin/service.yaml +++ b/apps/jellyfin/service.yaml @@ -4,9 +4,8 @@ metadata: name: jellyfin-svc namespace: jellyfin spec: - type: LoadBalancer + selector: + app: jellyfin ports: - name: web - port: 8096 - selector: - app: jellyfin \ No newline at end of file + port: 8096 \ No newline at end of file diff --git a/apps/plex/service.yaml b/apps/plex/service.yaml index afa8f1c..81831d8 100644 --- a/apps/plex/service.yaml +++ b/apps/plex/service.yaml @@ -3,9 +3,9 @@ kind: Service metadata: name: plex spec: + selector: + app: plex type: LoadBalancer ports: - name: web - port: 32400 - selector: - app: plex \ No newline at end of file + port: 32400 \ No newline at end of file diff --git a/infra/net-aux/ingress-route.yaml b/infra/net-aux/ingress-route.yaml index d7a052f..6c6f777 100644 --- a/infra/net-aux/ingress-route.yaml +++ b/infra/net-aux/ingress-route.yaml @@ -9,7 +9,7 @@ spec: - match: Host(`net-aux.stonegarden.dev`) kind: Rule services: - - name: pi-hole-web + - name: net-aux port: http middlewares: - name: traefik-forward-auth \ No newline at end of file diff --git a/infra/net-aux/service.yaml b/infra/net-aux/service.yaml index b16fd19..8f13ca7 100644 --- a/infra/net-aux/service.yaml +++ b/infra/net-aux/service.yaml @@ -1,74 +1,46 @@ ---- kind: Service apiVersion: v1 metadata: - name: pi-hole-dns-udp + name: net-aux namespace: net-aux annotations: + metallb.universe.tf/loadBalancerIPs: 192.168.1.153 metallb.universe.tf/allow-shared-ip: net-aux spec: selector: app: net-aux - ports: - - name: dns-udp - port: 53 - protocol: UDP - targetPort: dns-udp type: LoadBalancer ---- -kind: Service -apiVersion: v1 -metadata: - name: pi-hole-dns-tcp - namespace: net-aux - annotations: - metallb.universe.tf/allow-shared-ip: net-aux -spec: - selector: - app: net-aux - ports: - - name: dns-tcp - port: 53 - protocol: TCP - targetPort: dns-tcp - type: LoadBalancer ---- -kind: Service -apiVersion: v1 -metadata: - name: pi-hole-web - namespace: net-aux - annotations: - metallb.universe.tf/allow-shared-ip: net-aux -spec: - selector: - app: net-aux - ports: - - name: http - port: 80 - targetPort: http - - name: https - port: 443 - targetPort: https - type: LoadBalancer ---- -kind: Service -apiVersion: v1 -metadata: - name: unbound-dns - namespace: net-aux - annotations: - metallb.universe.tf/allow-shared-ip: net-aux -spec: - selector: - app: net-aux ports: - name: unbound-dns-tcp port: 5335 protocol: TCP targetPort: unbound-dns-tcp + - name: dns-tcp + port: 53 + protocol: TCP + targetPort: dns-tcp + - name: http + port: 80 + targetPort: http +--- +kind: Service +apiVersion: v1 +metadata: + name: net-aux-udp + namespace: net-aux + annotations: + metallb.universe.tf/loadBalancerIPs: 192.168.1.153 + metallb.universe.tf/allow-shared-ip: net-aux +spec: + selector: + app: net-aux + type: LoadBalancer + ports: - name: unbound-dns-udp port: 5335 protocol: UDP targetPort: unbound-dns-udp - type: LoadBalancer + - name: dns-udp + port: 53 + protocol: UDP + targetPort: dns-udp \ No newline at end of file diff --git a/infra/pi-hole/config/02-custom.conf b/infra/pi-hole/config/02-custom.conf index 2bc41a9..c2ac91b 100644 --- a/infra/pi-hole/config/02-custom.conf +++ b/infra/pi-hole/config/02-custom.conf @@ -1,2 +1,2 @@ address=/stonegarden.dev/192.168.1.128 -address=/stonegarden.lan/192.168.1.128 \ No newline at end of file +edns-packet-max=1232 diff --git a/infra/pi-hole/ingress-route.yaml b/infra/pi-hole/ingress-route.yaml index fca8cb9..e2a4e21 100644 --- a/infra/pi-hole/ingress-route.yaml +++ b/infra/pi-hole/ingress-route.yaml @@ -9,7 +9,7 @@ spec: - match: Host(`pi-hole.stonegarden.dev`) kind: Rule services: - - name: pi-hole-web + - name: pi-hole port: http middlewares: - name: traefik-forward-auth \ No newline at end of file diff --git a/infra/pi-hole/service.yaml b/infra/pi-hole/service.yaml index cdd4f68..b45350c 100644 --- a/infra/pi-hole/service.yaml +++ b/infra/pi-hole/service.yaml @@ -1,53 +1,38 @@ ---- kind: Service apiVersion: v1 metadata: - name: pi-hole-dns-udp + name: pi-hole namespace: pi-hole annotations: + metallb.universe.tf/loadBalancerIPs: 192.168.1.154 metallb.universe.tf/allow-shared-ip: pi-hole spec: selector: app: pi-hole + type: LoadBalancer + ports: + - name: http + port: 80 + targetPort: http + - name: dns-tcp + port: 53 + protocol: TCP + targetPort: dns-tcp +--- +kind: Service +apiVersion: v1 +metadata: + name: pi-hole-udp + namespace: pi-hole + annotations: + metallb.universe.tf/loadBalancerIPs: 192.168.1.154 + metallb.universe.tf/allow-shared-ip: pi-hole +spec: + selector: + app: pi-hole + type: LoadBalancer ports: - name: dns-udp port: 53 protocol: UDP targetPort: dns-udp - type: LoadBalancer ---- -kind: Service -apiVersion: v1 -metadata: - name: pi-hole-dns-tcp - namespace: pi-hole - annotations: - metallb.universe.tf/allow-shared-ip: pi-hole -spec: - selector: - app: pi-hole - ports: - - name: dns-tcp - port: 53 - protocol: TCP - targetPort: dns-tcp - type: LoadBalancer ---- -kind: Service -apiVersion: v1 -metadata: - name: pi-hole-web - namespace: pi-hole - annotations: - metallb.universe.tf/allow-shared-ip: pi-hole -spec: - selector: - app: pi-hole - ports: - - name: http - port: 80 - targetPort: http - - name: https - port: 443 - targetPort: https - type: LoadBalancer diff --git a/infra/traefik/values.yaml b/infra/traefik/values.yaml index c985dda..8b8c2eb 100644 --- a/infra/traefik/values.yaml +++ b/infra/traefik/values.yaml @@ -9,6 +9,10 @@ deployment: - name: data mountPath: /data +services: + annotations: + metallb.universe.tf/loadBalancerIPs: 192.168.1.128 + providers: kubernetesCRD: allowCrossNamespace: true