From 2e50f91c9386fb2e923f55bb82547dbf80f8ceb7 Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Sun, 17 Oct 2021 12:16:35 +0300 Subject: [PATCH] fix(tdarr): fix env's for tdarr (#1153) * try some fixes for tdarr's * bump versions * website does not like nested lists --- charts/incubator/tdarr-node/Chart.yaml | 2 +- .../incubator/tdarr-node/SCALE/questions.yaml | 6 ++-- charts/incubator/tdarr-node/values.yaml | 6 ++-- charts/incubator/tdarr/Chart.yaml | 2 +- charts/incubator/tdarr/SCALE/questions.yaml | 7 ++-- charts/incubator/tdarr/values.yaml | 6 ++-- .../stable/collabora-online/validation.md | 32 +++++++++---------- docs/apps/stable/tdarr-node/setup.md | 20 +++++++----- docs/apps/stable/tdarr/setup.md | 8 +++++ 9 files changed, 51 insertions(+), 38 deletions(-) create mode 100644 docs/apps/stable/tdarr/setup.md diff --git a/charts/incubator/tdarr-node/Chart.yaml b/charts/incubator/tdarr-node/Chart.yaml index c8265d1acf3..328696223a4 100644 --- a/charts/incubator/tdarr-node/Chart.yaml +++ b/charts/incubator/tdarr-node/Chart.yaml @@ -22,4 +22,4 @@ sources: - https://github.com/HaveAGitGat/Tdarr - https://hub.docker.com/r/haveagitgat/tdarr_node type: application -version: 0.0.1 +version: 0.0.2 diff --git a/charts/incubator/tdarr-node/SCALE/questions.yaml b/charts/incubator/tdarr-node/SCALE/questions.yaml index 6bf1f32a17d..66abde1d1e5 100644 --- a/charts/incubator/tdarr-node/SCALE/questions.yaml +++ b/charts/incubator/tdarr-node/SCALE/questions.yaml @@ -87,11 +87,10 @@ questions: schema: type: string required: true - $ref: - - "definitions/nodeIP" + default: "tdarr-node.ix-tdarr-node.svc.cluster.local" - variable: nodePort label: "nodePort" - description: "Sets the port of this node" + description: "Sets the port of this node." schema: type: int required: true @@ -625,6 +624,7 @@ questions: description: "Path inside the container the storage is mounted" schema: show_if: [["type", "=", "hostPath"]] + required: true type: hostpath - variable: hostPathType label: "hostPath Type" diff --git a/charts/incubator/tdarr-node/values.yaml b/charts/incubator/tdarr-node/values.yaml index b6fa34b324a..50ade82c9a6 100644 --- a/charts/incubator/tdarr-node/values.yaml +++ b/charts/incubator/tdarr-node/values.yaml @@ -14,12 +14,12 @@ podSecurityContext: runAsGroup: 0 env: - serverIP: "0.0.0.0" - serverPort: 8266 + PUID: 568 nodeID: "myFirstTdarrNode" nodeIP: "0.0.0.0" nodePort: 8267 - PUID: 568 + serverIP: "0.0.0.0" + serverPort: 8266 service: main: diff --git a/charts/incubator/tdarr/Chart.yaml b/charts/incubator/tdarr/Chart.yaml index d7da77bb1b4..97d7b20258a 100644 --- a/charts/incubator/tdarr/Chart.yaml +++ b/charts/incubator/tdarr/Chart.yaml @@ -22,4 +22,4 @@ sources: - https://github.com/HaveAGitGat/Tdarr - https://hub.docker.com/r/haveagitgat/tdarr type: application -version: 0.0.1 +version: 0.0.2 diff --git a/charts/incubator/tdarr/SCALE/questions.yaml b/charts/incubator/tdarr/SCALE/questions.yaml index a4c767b9917..fe23dff86ac 100644 --- a/charts/incubator/tdarr/SCALE/questions.yaml +++ b/charts/incubator/tdarr/SCALE/questions.yaml @@ -88,11 +88,11 @@ questions: schema: type: string required: true - $ref: - - "definitions/nodeIP" + hidden: true + default: "localhost" - variable: serverPort label: "serverPort" - description: "Sets the server port." + description: "Sets the server's comm port." schema: type: int required: true @@ -865,6 +865,7 @@ questions: description: "Path inside the container the storage is mounted" schema: show_if: [["type", "=", "hostPath"]] + required: true type: hostpath - variable: hostPathType label: "hostPath Type" diff --git a/charts/incubator/tdarr/values.yaml b/charts/incubator/tdarr/values.yaml index 6d3bf0f3bf8..1fd17e4a5d3 100644 --- a/charts/incubator/tdarr/values.yaml +++ b/charts/incubator/tdarr/values.yaml @@ -14,10 +14,10 @@ podSecurityContext: runAsGroup: 0 env: - webUIPort: 8265 - serverIP: "0.0.0.0" - serverPort: 8266 PUID: 568 + serverIP: "localhost" + serverPort: 8266 + webUIPort: 8265 service: main: diff --git a/docs/apps/stable/collabora-online/validation.md b/docs/apps/stable/collabora-online/validation.md index 6c3ace80630..d7121d8fd43 100644 --- a/docs/apps/stable/collabora-online/validation.md +++ b/docs/apps/stable/collabora-online/validation.md @@ -7,22 +7,22 @@ Accepted formats are: - Multiple FQDN (eg. `cloud.mydomain.com|nextcloud.mydomain.com` or `mydomain.com|cname.mydomain.com`) - Each FQDN is separated with `|` Each FQDN is split into parts -* Hostname (`cname`.domain.com) _Optional_ - * Can have from 1 up to 127 levels deep cnames. - * Can contain [0-9], [a-z] and `-`. - * Must be at least 1 char and no longer than 63 chars. - * Must start with [a-z], [0-9]. - * Must NOT end with `-`. -* Domain (cname.`domain`.com) - * Can contain [0-9], [a-z] and `-`. - * Must be at least 1 chars and no longer than 63 chars. - * Must start with [a-z], [0-9]. - * Must NOT end with `-`. -* Top-Level-Domains (cname.domain.`com`) - * Can contain [0-9], [a-z] and `-`. - * Must be at least 2 chars and no longer than 63 chars. - * Must start with [a-z]. - * Must NOT end with `-`. +__Hostname (`cname`.domain.com)__ _Optional_ +* Can have from 1 up to 127 levels deep cnames. +* Can contain [0-9], [a-z] and `-`. +* Must be at least 1 char and no longer than 63 chars. +* Must start with [a-z], [0-9]. +* Must NOT end with `-`. +__Domain (cname.`domain`.com)__ +* Can contain [0-9], [a-z] and `-`. +* Must be at least 1 chars and no longer than 63 chars. +* Must start with [a-z], [0-9]. +* Must NOT end with `-`. +__Top-Level-Domains (cname.domain.`com`)__ +* Can contain [0-9], [a-z] and `-`. +* Must be at least 2 chars and no longer than 63 chars. +* Must start with [a-z]. +* Must NOT end with `-`. Regex used to match those: `^(([a-z\d](-?[a-z\d]){0,62})\.)*(([a-z\d](-?[a-z\d]){0,62})\.)([a-z](-?[a-z\d]){1,62})((\|((([a-z\d](-?[a-z\d]){0,62})\.)*(([a-z\d](-?[a-z\d]){0,62})\.)([a-z](-?[a-z\d]){1,62})))*)$` You can try live [here](https://regex101.com/r/rIxhye/1) diff --git a/docs/apps/stable/tdarr-node/setup.md b/docs/apps/stable/tdarr-node/setup.md index 58155b1060f..97a70b7d1bb 100644 --- a/docs/apps/stable/tdarr-node/setup.md +++ b/docs/apps/stable/tdarr-node/setup.md @@ -9,16 +9,20 @@ Make sure the Node and Server instances have the same media library and transcod ## Connecting Node with a Server -__If the node is running on the same cluster:__ +__If the node is running on the same cluster with the tdarr server:__ -Assuming the server is named as `tdarr`. +Assuming the node is named `tdarr-node` and server is named as `tdarr`. -* serverIP: tdarr-comm.ix-tdarr.svc.cluster.local -* serverPort: 8266 (The internal port used by the app) +* nodeIP: `tdarr-node.ix-tdarr-node.svc.cluster.local` +* serverIP: `tdarr-comm.ix-tdarr.svc.cluster.local` +* serverPort: `8266` (The internal port used by the app) -For more info on how to generate the internal dns, visit our website. Check the linking apps internally section on the manual. +For more info on how to generate the internal dns, visit our website [here](https://truecharts.org/manual/Quick-Start%20Guides/14-linking-apps/). Check the linking apps internally section on the manual. -__If the node is running on a different cluster or non-SCALE machine:__ +__If the node is running on a different cluster or SCALE machine than the tdarr server:__ -* serverIP: YOUR.HOST.SERVER.IP -* serverPort: 36152 (Default nodePort) +Assuming the node is named `tdarr-node` + +* nodeIP: `tdarr-node.ix-tdarr-node.svc.cluster.local` +* serverIP: YOUR.ACTUALHOST.SERVER.IP +* serverPort: `36152` (Default nodePort) diff --git a/docs/apps/stable/tdarr/setup.md b/docs/apps/stable/tdarr/setup.md new file mode 100644 index 00000000000..0df2665fe6f --- /dev/null +++ b/docs/apps/stable/tdarr/setup.md @@ -0,0 +1,8 @@ +## Temp / Transcode cache + +Tdarr uses the temp folder (trascode-cache, `/temp`) to store the encoded file (not chunks of it, but the whole file). It's recommended to __avoid__ mounting this folder to RAM. +If you encode a large file which will result in a 10GB file, this is the amount of RAM it will consume. + +## Media folder mounts + +Make sure the Node and Server instances have the same media library and transcode cache locations. In other words, the cache and library must be shared between the Node and Server.