diff --git a/apps/media/server.deployment.yaml b/apps/media/deployment.yaml similarity index 93% rename from apps/media/server.deployment.yaml rename to apps/media/deployment.yaml index 55effef..966fb7a 100644 --- a/apps/media/server.deployment.yaml +++ b/apps/media/deployment.yaml @@ -18,6 +18,9 @@ spec: limits: memory: "2Gi" cpu: "2" + requests: + memory: "128Mi" + cpu: "250M" ports: - containerPort: 8096 name: jellyfin diff --git a/apps/media/ingress.yaml b/apps/media/ingress.yaml index 4a82609..af0a67c 100644 --- a/apps/media/ingress.yaml +++ b/apps/media/ingress.yaml @@ -1,24 +1,5 @@ apiVersion: traefik.io/v1alpha1 kind: IngressRoute -metadata: - name: jellyfin-vue-ingress - namespace: media -spec: - entryPoints: - - websecure - routes: - - match: Host(`media.kluster.moll.re`) - middlewares: - - name: jellyfin-websocket - kind: Rule - services: - - name: jellyfin-web - port: 80 - tls: - certResolver: default-tls ---- -apiVersion: traefik.io/v1alpha1 -kind: IngressRoute metadata: name: jellyfin-backend-ingress namespace: media @@ -26,7 +7,7 @@ spec: entryPoints: - websecure routes: - - match: Host(`media-backend.kluster.moll.re`) && !Path(`/metrics`) + - match: Host(`media.kluster.moll.re`) && !Path(`/metrics`) middlewares: - name: jellyfin-websocket - name: jellyfin-server-headers diff --git a/apps/media/jellyfin.servicemonitor.yaml b/apps/media/jellyfin.servicemonitor.yaml deleted file mode 100644 index d71f230..0000000 --- a/apps/media/jellyfin.servicemonitor.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: jellyfin - labels: - metrics: prometheus -spec: - selector: - matchLabels: - app: jellyfin-server-service - endpoints: - - path: /metrics - targetPort: jellyfin - -# this exposes metrics on port 8096 as enabled in the jellyfin config -# https://jellyfin.org/docs/general/networking/monitoring/ -# the metrics are available at /metrics but blocked by the ingress diff --git a/apps/media/kustomization.yaml b/apps/media/kustomization.yaml index 29b26ff..28f7369 100644 --- a/apps/media/kustomization.yaml +++ b/apps/media/kustomization.yaml @@ -5,16 +5,11 @@ namespace: media resources: - namespace.yaml - pvc.yaml - - server.deployment.yaml - - server.service.yaml - - web.deployment.yaml - - web.service.yaml + - deployment.yaml + - service.yaml - ingress.yaml images: - name: jellyfin/jellyfin newName: jellyfin/jellyfin newTag: 10.9.6 - - name: ghcr.io/jellyfin/jellyfin-vue - newName: ghcr.io/jellyfin/jellyfin-vue - newTag: stable-rc.0.3.1 diff --git a/apps/media/server.service.yaml b/apps/media/service.yaml similarity index 100% rename from apps/media/server.service.yaml rename to apps/media/service.yaml diff --git a/apps/media/web.deployment.yaml b/apps/media/web.deployment.yaml deleted file mode 100644 index 42ea177..0000000 --- a/apps/media/web.deployment.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: jellyfin-web -spec: - selector: - matchLabels: - app: jellyfin-web - template: - metadata: - labels: - app: jellyfin-web - spec: - containers: - - name: jellyfin-web - image: ghcr.io/jellyfin/jellyfin-vue - resources: - limits: - memory: "128Mi" - cpu: "30m" - ports: - - containerPort: 80 - env: - - name: TZ - value: Europe/Berlin - - name: DEFAULT_SERVERS - value: "https://media-backend.kluster.moll.re" diff --git a/apps/media/web.service.yaml b/apps/media/web.service.yaml deleted file mode 100644 index e15c8ca..0000000 --- a/apps/media/web.service.yaml +++ /dev/null @@ -1,12 +0,0 @@ - -apiVersion: v1 -kind: Service -metadata: - name: jellyfin-web -spec: - selector: - app: jellyfin-web - ports: - - protocol: TCP - port: 80 - targetPort: 80