diff --git a/remodel/k8s/apps/media/jellyfin/ingress.yaml b/remodel/k8s/apps/media/jellyfin/ingress.yaml index 5f95392..669d70b 100644 --- a/remodel/k8s/apps/media/jellyfin/ingress.yaml +++ b/remodel/k8s/apps/media/jellyfin/ingress.yaml @@ -7,18 +7,12 @@ metadata: cert-manager.io/cluster-issuer: cloudflare-cluster-issuer spec: ingressClassName: cilium + defaultBackend: + service: + name: jellyfin + port: + name: web tls: - - hosts: + - secretName: jellyfin-ingress-tls + hosts: - jellyfin.stonegarden.dev - secretName: jellyfin-ingress-tls - rules: - - host: jellyfin.stonegarden.dev - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: jellyfin - port: - number: 8096 diff --git a/remodel/k8s/apps/media/jellyfin/svc.yaml b/remodel/k8s/apps/media/jellyfin/svc.yaml index a824abd..2d67990 100644 --- a/remodel/k8s/apps/media/jellyfin/svc.yaml +++ b/remodel/k8s/apps/media/jellyfin/svc.yaml @@ -4,11 +4,11 @@ metadata: name: jellyfin namespace: jellyfin annotations: - io.cilium/lb-ipam-ips: 192.168.1.228 + io.cilium/lb-ipam-ips: 192.168.1.229 spec: + type: LoadBalancer selector: app: jellyfin - type: LoadBalancer ports: - - name: http - port: 8096 \ No newline at end of file + - name: web + port: 8096 diff --git a/remodel/k8s/apps/media/plex/deployment.yaml b/remodel/k8s/apps/media/plex/deployment.yaml index 9b8c27e..97ff213 100644 --- a/remodel/k8s/apps/media/plex/deployment.yaml +++ b/remodel/k8s/apps/media/plex/deployment.yaml @@ -11,6 +11,9 @@ spec: matchLabels: app: plex template: + metadata: + labels: + app: plex spec: nodeSelector: topology.kubernetes.io/zone: abel diff --git a/remodel/k8s/apps/media/plex/ingress.yaml b/remodel/k8s/apps/media/plex/ingress.yaml index ecbbc32..397db76 100644 --- a/remodel/k8s/apps/media/plex/ingress.yaml +++ b/remodel/k8s/apps/media/plex/ingress.yaml @@ -7,18 +7,12 @@ metadata: cert-manager.io/cluster-issuer: cloudflare-cluster-issuer spec: ingressClassName: cilium + defaultBackend: + service: + name: plex + port: + name: web tls: - - hosts: + - secretName: plex-ingress-tls + hosts: - plex.stonegarden.dev - secretName: plex-ingress-tls - rules: - - host: plex.stonegarden.dev - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: plex - port: - number: 32400 diff --git a/remodel/k8s/apps/media/plex/kustomization.yaml b/remodel/k8s/apps/media/plex/kustomization.yaml index 9c8967a..d4b8d53 100644 --- a/remodel/k8s/apps/media/plex/kustomization.yaml +++ b/remodel/k8s/apps/media/plex/kustomization.yaml @@ -8,6 +8,7 @@ configMapGenerator: namespace: plex literals: - TZ="Europe/Oslo" + - PLEX_ADVERTISE_URL=https://plex.stonegarden.dev:443,http://192.168.1.228:32400 resources: - ns.yaml diff --git a/remodel/k8s/apps/media/plex/svc.yaml b/remodel/k8s/apps/media/plex/svc.yaml index 9e12f14..7917de3 100644 --- a/remodel/k8s/apps/media/plex/svc.yaml +++ b/remodel/k8s/apps/media/plex/svc.yaml @@ -4,11 +4,11 @@ metadata: name: plex namespace: plex annotations: - io.cilium/lb-ipam-ips: 192.168.1.229 + io.cilium/lb-ipam-ips: 192.168.1.228 spec: + type: LoadBalancer selector: app: plex - type: LoadBalancer ports: - - name: http - port: 32400 \ No newline at end of file + - name: web + port: 32400