diff --git a/k8s/apps/furumi-dev/external-secrets.yaml b/k8s/apps/furumi-dev/external-secrets.yaml index 0f21d84..3941c1d 100644 --- a/k8s/apps/furumi-dev/external-secrets.yaml +++ b/k8s/apps/furumi-dev/external-secrets.yaml @@ -20,8 +20,6 @@ spec: {{ .session_secret }} PG_STRING: |- postgres://furumi_dev:{{ .pg_pass }}@psql.psql.svc:5432/furumi_dev - PLAYER_API_KEY: |- - {{ .player_api_key }} data: - secretKey: client_id sourceRef: @@ -47,14 +45,6 @@ spec: remoteRef: key: 960735e6-2cc9-4b68-9bd3-e6786e5a0cd6 property: fields[2].value - - secretKey: player_api_key - sourceRef: - storeRef: - name: vaultwarden-login - kind: ClusterSecretStore - remoteRef: - key: 960735e6-2cc9-4b68-9bd3-e6786e5a0cd6 - property: fields[3].value - secretKey: pg_pass sourceRef: storeRef: diff --git a/k8s/apps/furumi-dev/ingress.yaml b/k8s/apps/furumi-dev/ingress.yaml index 9bd1f77..1c54044 100644 --- a/k8s/apps/furumi-dev/ingress.yaml +++ b/k8s/apps/furumi-dev/ingress.yaml @@ -22,13 +22,20 @@ spec: - host: music-dev.hexor.cy http: paths: - - path: / + - path: /api pathType: Prefix backend: service: name: furumi-dev-web-player port: number: 8080 + - path: / + pathType: Prefix + backend: + service: + name: furumi-dev-node-player + port: + number: 3001 tls: - secretName: furumi-tls hosts: diff --git a/k8s/apps/furumi-dev/kustomization.yaml b/k8s/apps/furumi-dev/kustomization.yaml index 692cad5..92f0d08 100644 --- a/k8s/apps/furumi-dev/kustomization.yaml +++ b/k8s/apps/furumi-dev/kustomization.yaml @@ -7,4 +7,5 @@ resources: - external-secrets.yaml - ingress.yaml - web-player.yaml + - node-player.yaml - metadata-agent.yaml diff --git a/k8s/apps/furumi-dev/node-player.yaml b/k8s/apps/furumi-dev/node-player.yaml new file mode 100644 index 0000000..cf18f8e --- /dev/null +++ b/k8s/apps/furumi-dev/node-player.yaml @@ -0,0 +1,53 @@ +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 c7ecdea..f8fbe87 100644 --- a/k8s/apps/furumi-dev/service.yaml +++ b/k8s/apps/furumi-dev/service.yaml @@ -26,7 +26,23 @@ spec: selector: app: furumi-dev-web-player ports: - - name: web-ui + - 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 diff --git a/k8s/apps/furumi-dev/web-player.yaml b/k8s/apps/furumi-dev/web-player.yaml index 36e0692..3b2f38e 100644 --- a/k8s/apps/furumi-dev/web-player.yaml +++ b/k8s/apps/furumi-dev/web-player.yaml @@ -51,17 +51,12 @@ spec: secretKeyRef: name: furumi-ng-creds key: PG_STRING - - name: FURUMI_PLAYER_API_KEY - valueFrom: - secretKeyRef: - name: furumi-ng-creds - key: PLAYER_API_KEY - name: FURUMI_PLAYER_STORAGE_DIR value: "/media" - name: RUST_LOG value: "info" ports: - - name: web-ui + - name: http containerPort: 8080 protocol: TCP volumeMounts: @@ -72,4 +67,3 @@ spec: hostPath: path: /k8s/furumi-dev/library type: DirectoryOrCreate -