diff --git a/k8s/apps/furumi-dev/deployment.yaml b/k8s/apps/furumi-dev/deployment.yaml new file mode 100644 index 0000000..dea8359 --- /dev/null +++ b/k8s/apps/furumi-dev/deployment.yaml @@ -0,0 +1,46 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: furumi-dev-player + labels: + app: furumi-dev-player +spec: + replicas: 1 + selector: + matchLabels: + app: furumi-dev-player + template: + metadata: + labels: + app: furumi-dev-player + spec: + nodeSelector: + kubernetes.io/hostname: master.tail2fe2d.ts.net + containers: + - name: furumi-dev-player + image: ultradesu/furumusic:latest + imagePullPolicy: Always + env: + - name: FURU_DATABASE_URL + valueFrom: + secretKeyRef: + name: furumi-dev-creds + key: PG_STRING + ports: + - containerPort: 8000 + name: http + volumeMounts: + - name: library + mountPath: /media + - name: inbox + mountPath: /inbox + volumes: + - name: library + hostPath: + path: /k8s/furumi-dev/library-new + type: DirectoryOrCreate + - name: inbox + hostPath: + path: /k8s/furumi-dev/inbox-new + type: DirectoryOrCreate + diff --git a/k8s/apps/furumi-dev/external-secrets.yaml b/k8s/apps/furumi-dev/external-secrets.yaml index 3941c1d..b6830b4 100644 --- a/k8s/apps/furumi-dev/external-secrets.yaml +++ b/k8s/apps/furumi-dev/external-secrets.yaml @@ -5,46 +5,46 @@ metadata: name: furumi-ng-creds spec: target: - name: furumi-ng-creds + name: furumi-dev-creds deletionPolicy: Delete template: type: Opaque data: - OIDC_CLIENT_ID: |- - {{ .client_id }} - OIDC_CLIENT_SECRET: |- - {{ .client_secret }} - OIDC_ISSUER_URL: https://idm.hexor.cy/application/o/furumi-dev/ - OIDC_REDIRECT_URL: https://music-dev.hexor.cy/auth/callback - OIDC_SESSION_SECRET: |- - {{ .session_secret }} + #OIDC_CLIENT_ID: |- + # {{ .client_id }} + #OIDC_CLIENT_SECRET: |- + # {{ .client_secret }} + #OIDC_ISSUER_URL: https://idm.hexor.cy/application/o/furumi-dev/ + #OIDC_REDIRECT_URL: https://music-dev.hexor.cy/auth/callback + #OIDC_SESSION_SECRET: |- + # {{ .session_secret }} PG_STRING: |- postgres://furumi_dev:{{ .pg_pass }}@psql.psql.svc:5432/furumi_dev data: - - secretKey: client_id - sourceRef: - storeRef: - name: vaultwarden-login - kind: ClusterSecretStore - remoteRef: - key: 960735e6-2cc9-4b68-9bd3-e6786e5a0cd6 - property: fields[0].value - - secretKey: client_secret - sourceRef: - storeRef: - name: vaultwarden-login - kind: ClusterSecretStore - remoteRef: - key: 960735e6-2cc9-4b68-9bd3-e6786e5a0cd6 - property: fields[1].value - - secretKey: session_secret - sourceRef: - storeRef: - name: vaultwarden-login - kind: ClusterSecretStore - remoteRef: - key: 960735e6-2cc9-4b68-9bd3-e6786e5a0cd6 - property: fields[2].value + # - secretKey: client_id + # sourceRef: + # storeRef: + # name: vaultwarden-login + # kind: ClusterSecretStore + # remoteRef: + # key: 960735e6-2cc9-4b68-9bd3-e6786e5a0cd6 + # property: fields[0].value + # - secretKey: client_secret + # sourceRef: + # storeRef: + # name: vaultwarden-login + # kind: ClusterSecretStore + # remoteRef: + # key: 960735e6-2cc9-4b68-9bd3-e6786e5a0cd6 + # property: fields[1].value + # - secretKey: session_secret + # sourceRef: + # storeRef: + # name: vaultwarden-login + # kind: ClusterSecretStore + # remoteRef: + # key: 960735e6-2cc9-4b68-9bd3-e6786e5a0cd6 + # property: fields[2].value - secretKey: pg_pass sourceRef: storeRef: diff --git a/k8s/apps/furumi-dev/ingress.yaml b/k8s/apps/furumi-dev/ingress.yaml index 1c54044..41fa3a2 100644 --- a/k8s/apps/furumi-dev/ingress.yaml +++ b/k8s/apps/furumi-dev/ingress.yaml @@ -1,17 +1,8 @@ --- -apiVersion: traefik.io/v1alpha1 -kind: Middleware -metadata: - name: admin-strip -spec: - stripPrefix: - prefixes: - - /admin ---- apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: furumi-tls-ingress + name: furumi-dev-tls-ingress annotations: ingressClassName: traefik cert-manager.io/cluster-issuer: letsencrypt @@ -22,45 +13,15 @@ spec: - host: music-dev.hexor.cy http: paths: - - path: /api - pathType: Prefix - backend: - service: - name: furumi-dev-web-player - port: - number: 8080 - path: / pathType: Prefix backend: service: - name: furumi-dev-node-player + name: furumi-dev-player port: - number: 3001 + number: 8000 tls: - - secretName: furumi-tls + - secretName: furumi-dev-tls hosts: - - '*.hexor.cy' ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: furumi-dev-admin-ingress - annotations: - ingressClassName: traefik - traefik.ingress.kubernetes.io/router.middlewares: furumi-server-admin-strip@kubernetescrd,kube-system-https-redirect@kubernetescrd -spec: - rules: - - host: music-dev.hexor.cy - http: - paths: - - path: /admin - pathType: Prefix - backend: - service: - name: furumi-dev-metadata-agent - port: - number: 8090 - tls: - - secretName: furumi-tls - hosts: - - '*.hexor.cy' + - music-dev.hexor.cy + diff --git a/k8s/apps/furumi-dev/kustomization.yaml b/k8s/apps/furumi-dev/kustomization.yaml index 92f0d08..8755c8e 100644 --- a/k8s/apps/furumi-dev/kustomization.yaml +++ b/k8s/apps/furumi-dev/kustomization.yaml @@ -6,6 +6,4 @@ resources: - service.yaml - external-secrets.yaml - ingress.yaml - - web-player.yaml - - node-player.yaml - - metadata-agent.yaml + - deployment.yaml diff --git a/k8s/apps/furumi-dev/metadata-agent.yaml b/k8s/apps/furumi-dev/metadata-agent.yaml deleted file mode 100644 index f4dc7bd..0000000 --- a/k8s/apps/furumi-dev/metadata-agent.yaml +++ /dev/null @@ -1,59 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: furumi-dev-metadata-agent - labels: - app: furumi-dev-metadata-agent -spec: - replicas: 1 - selector: - matchLabels: - app: furumi-dev-metadata-agent - template: - metadata: - labels: - app: furumi-dev-metadata-agent - spec: - nodeSelector: - kubernetes.io/hostname: master.tail2fe2d.ts.net - containers: - - name: furumi-dev-metadata-agent - image: ultradesu/furumi-metadata-agent:dev - imagePullPolicy: Always - env: - - name: FURUMI_AGENT_DATABASE_URL - valueFrom: - secretKeyRef: - name: furumi-ng-creds - key: PG_STRING - - name: FURUMI_AGENT_INBOX_DIR - value: "/inbox" - - name: FURUMI_AGENT_STORAGE_DIR - value: "/media" - - name: FURUMI_AGENT_OLLAMA_URL - value: "http://100.120.76.49:1234" - - name: FURUMI_AGENT_OLLAMA_MODEL - value: "qwen2.5-32b-instruct" - - name: FURUMI_AGENT_POLL_INTERVAL_SECS - value: "10" - - name: RUST_LOG - value: "info" - ports: - - name: admin-ui - containerPort: 8090 - protocol: TCP - volumeMounts: - - name: library - mountPath: /media - - name: inbox - mountPath: /inbox - volumes: - - name: library - hostPath: - path: /k8s/furumi-dev/library - type: DirectoryOrCreate - - name: inbox - hostPath: - path: /k8s/furumi-dev/inbox - type: DirectoryOrCreate - diff --git a/k8s/apps/furumi-dev/node-player.yaml b/k8s/apps/furumi-dev/node-player.yaml deleted file mode 100644 index cf18f8e..0000000 --- a/k8s/apps/furumi-dev/node-player.yaml +++ /dev/null @@ -1,53 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: furumi-dev-node-player - labels: - app: furumi-dev-node-player -spec: - replicas: 1 - selector: - matchLabels: - app: furumi-dev-node-player - template: - metadata: - labels: - app: furumi-dev-node-player - spec: - nodeSelector: - kubernetes.io/hostname: master.tail2fe2d.ts.net - containers: - - name: furumi-dev-node-player - image: ultradesu/furumi-node-player:dev - imagePullPolicy: Always - env: - - name: PORT - value: "3001" - - name: BASE_URL - value: "https://music-dev.hexor.cy" - - name: FRONTEND_ORIGIN - value: "https://music-dev.hexor.cy" - - name: SESSION_SECRET - valueFrom: - secretKeyRef: - name: furumi-ng-creds - key: OIDC_SESSION_SECRET - - name: OIDC_ISSUER_BASE_URL - valueFrom: - secretKeyRef: - name: furumi-ng-creds - key: OIDC_ISSUER_URL - - name: OIDC_CLIENT_ID - valueFrom: - secretKeyRef: - name: furumi-ng-creds - key: OIDC_CLIENT_ID - - name: OIDC_CLIENT_SECRET - valueFrom: - secretKeyRef: - name: furumi-ng-creds - key: OIDC_CLIENT_SECRET - ports: - - name: http - containerPort: 3001 - protocol: TCP diff --git a/k8s/apps/furumi-dev/service.yaml b/k8s/apps/furumi-dev/service.yaml index f8fbe87..995f14c 100644 --- a/k8s/apps/furumi-dev/service.yaml +++ b/k8s/apps/furumi-dev/service.yaml @@ -2,47 +2,15 @@ apiVersion: v1 kind: Service metadata: - name: furumi-dev-metadata-agent + name: furumi-dev-player labels: - app: furumi-dev-metadata-agent + app: furumi-dev-player spec: type: ClusterIP selector: - app: furumi-dev-metadata-agent - ports: - - name: admin-ui - protocol: TCP - port: 8090 - targetPort: 8090 ---- -apiVersion: v1 -kind: Service -metadata: - name: furumi-dev-web-player - labels: - app: furumi-dev-web-player -spec: - type: ClusterIP - selector: - app: furumi-dev-web-player + app: furumi-dev-player ports: - name: http protocol: TCP - port: 8080 - targetPort: 8080 ---- -apiVersion: v1 -kind: Service -metadata: - name: furumi-dev-node-player - labels: - app: furumi-dev-node-player -spec: - type: ClusterIP - selector: - app: furumi-dev-node-player - ports: - - name: http - protocol: TCP - port: 3001 - targetPort: 3001 + port: 3000 + targetPort: 3000 diff --git a/k8s/apps/furumi-dev/web-player.yaml b/k8s/apps/furumi-dev/web-player.yaml deleted file mode 100644 index 3b2f38e..0000000 --- a/k8s/apps/furumi-dev/web-player.yaml +++ /dev/null @@ -1,69 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: furumi-dev-web-player - labels: - app: furumi-dev-web-player -spec: - replicas: 1 - selector: - matchLabels: - app: furumi-dev-web-player - template: - metadata: - labels: - app: furumi-dev-web-player - spec: - nodeSelector: - kubernetes.io/hostname: master.tail2fe2d.ts.net - containers: - - name: furumi-dev-web-player - image: ultradesu/furumi-web-player:dev - imagePullPolicy: Always - env: - - name: FURUMI_PLAYER_OIDC_CLIENT_ID - valueFrom: - secretKeyRef: - name: furumi-ng-creds - key: OIDC_CLIENT_ID - - name: FURUMI_PLAYER_OIDC_CLIENT_SECRET - valueFrom: - secretKeyRef: - name: furumi-ng-creds - key: OIDC_CLIENT_SECRET - - name: FURUMI_PLAYER_OIDC_ISSUER_URL - valueFrom: - secretKeyRef: - name: furumi-ng-creds - key: OIDC_ISSUER_URL - - name: FURUMI_PLAYER_OIDC_REDIRECT_URL - valueFrom: - secretKeyRef: - name: furumi-ng-creds - key: OIDC_REDIRECT_URL - - name: FURUMI_PLAYER_OIDC_SESSION_SECRET - valueFrom: - secretKeyRef: - name: furumi-ng-creds - key: OIDC_SESSION_SECRET - - name: FURUMI_PLAYER_DATABASE_URL - valueFrom: - secretKeyRef: - name: furumi-ng-creds - key: PG_STRING - - name: FURUMI_PLAYER_STORAGE_DIR - value: "/media" - - name: RUST_LOG - value: "info" - ports: - - name: http - containerPort: 8080 - protocol: TCP - volumeMounts: - - name: music - mountPath: /media - volumes: - - name: music - hostPath: - path: /k8s/furumi-dev/library - type: DirectoryOrCreate