-
Notifications
You must be signed in to change notification settings - Fork 58
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* add jellyfin * curl * update lib * update lib * update lib * update lib * adapt to lib changes * update lib * adapt to lib changes * update lib * adapt to lib changes * update lib * adapt to lib changes * update lib * add migration * clean up migration * fix mig * add portal and notes * gpu support * update lib * add gpu migration * remeov todo * update helper * update lib * fix typo * add video for test * use correct group * gpu mig helper * update lib
- Loading branch information
Showing
29 changed files
with
2,056 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ words: | |
- Healtcheck | ||
- ipaddr | ||
- isready | ||
- Jellyfin | ||
- logsearch | ||
- Mebibytes | ||
- minio | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# Jellyfin | ||
|
||
[Jellyfin](https://jellyfin.org/) is a Free Software Media System that puts you in control of managing and streaming your media. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
app_version: 10.9.7 | ||
capabilities: [] | ||
categories: | ||
- media | ||
description: Jellyfin is a Free Software Media System that puts you in control of | ||
managing and streaming your media. | ||
home: https://jellyfin.org/ | ||
host_mounts: [] | ||
icon: https://media.sys.truenas.net/apps/jellyfin/icons/icon.svg | ||
keywords: | ||
- entertainment | ||
- movies | ||
- series | ||
- tv | ||
- media | ||
- streaming | ||
lib_version: 1.0.0 | ||
lib_version_hash: 04058cefffe4eeadb07035ab157987492a31d5708705d6b7153d262beb75a796 | ||
maintainers: | ||
- email: [email protected] | ||
name: truenas | ||
url: https://www.truenas.com/ | ||
name: jellyfin | ||
run_as_context: | ||
- description: Jellyfin runs as any non-root user. | ||
gid: 568 | ||
group_name: jellyfin | ||
uid: 568 | ||
user_name: jellyfin | ||
screenshots: | ||
- https://media.sys.truenas.net/apps/jellyfin/screenshots/screenshot1.png | ||
- https://media.sys.truenas.net/apps/jellyfin/screenshots/screenshot2.png | ||
sources: | ||
- https://hub.docker.com/r/jellyfin/jellyfin | ||
- https://jellyfin.org/ | ||
title: Jellyfin | ||
train: community | ||
version: 1.0.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
categories: | ||
- media | ||
icon_url: https://media.sys.truenas.net/apps/jellyfin/icons/icon.svg | ||
screenshots: | ||
- https://media.sys.truenas.net/apps/jellyfin/screenshots/screenshot1.png | ||
- https://media.sys.truenas.net/apps/jellyfin/screenshots/screenshot2.png | ||
tags: | ||
- entertainment | ||
- movies | ||
- series | ||
- tv | ||
- media | ||
- streaming |
51 changes: 51 additions & 0 deletions
51
ix-dev/community/jellyfin/migrations/migrate_from_kubernetes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
#!/usr/bin/python3 | ||
|
||
import os | ||
import sys | ||
import yaml | ||
|
||
from migration_helpers.resources import migrate_resources | ||
from migration_helpers.storage import migrate_storage_item | ||
|
||
|
||
def migrate(values): | ||
config = values.get("helm_secret", {}).get("config", {}) | ||
if not config: | ||
raise ValueError("No config found in values") | ||
|
||
new_values = { | ||
"TZ": config["TZ"], | ||
"jellyfin": { | ||
"additional_envs": config["jellyfinConfig"].get("additionalEnvs", []), | ||
"publish_server_url": config["jellyfinConfig"].get("publishServerUrl", ""), | ||
}, | ||
"run_as": { | ||
"user": config["jellyfinRunAs"].get("user", 568), | ||
"group": config["jellyfinRunAs"].get("group", 568), | ||
}, | ||
"network": { | ||
"host_network": config["jellyfinNetwork"].get("hostNetwork", False), | ||
"web_port": config["jellyfinNetwork"].get("webPort", 30013), | ||
}, | ||
"storage": { | ||
"config": migrate_storage_item(config["jellyfinStorage"]["config"]), | ||
"cache": migrate_storage_item(config["jellyfinStorage"]["cache"]), | ||
"transcodes": migrate_storage_item(config["jellyfinStorage"]["transcodes"]), | ||
"additional_storage": [ | ||
migrate_storage_item(item, include_read_only=True) | ||
for item in config["jellyfinStorage"]["additionalStorages"] | ||
], | ||
}, | ||
"resources": migrate_resources(config["resources"], config["jellyfinGPU"]), | ||
} | ||
|
||
return new_values | ||
|
||
|
||
if __name__ == "__main__": | ||
if len(sys.argv) != 2: | ||
exit(1) | ||
|
||
if os.path.exists(sys.argv[1]): | ||
with open(sys.argv[1], "r") as f: | ||
print(yaml.dump(migrate(yaml.safe_load(f.read())))) |
Empty file.
27 changes: 27 additions & 0 deletions
27
ix-dev/community/jellyfin/migrations/migration_helpers/cpu.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
import math | ||
import re | ||
import os | ||
|
||
CPU_COUNT = os.cpu_count() | ||
|
||
NUMBER_REGEX = re.compile(r"^[1-9][0-9]$") | ||
FLOAT_REGEX = re.compile(r"^[0-9]+\.[0-9]+$") | ||
MILI_CPU_REGEX = re.compile(r"^[0-9]+m$") | ||
|
||
|
||
def transform_cpu(cpu) -> int: | ||
result = 2 | ||
if NUMBER_REGEX.match(cpu): | ||
result = int(cpu) | ||
elif FLOAT_REGEX.match(cpu): | ||
result = int(math.ceil(float(cpu))) | ||
elif MILI_CPU_REGEX.match(cpu): | ||
num = int(cpu[:-1]) | ||
num = num / 1000 | ||
result = int(math.ceil(num)) | ||
|
||
if CPU_COUNT is not None: | ||
# Do not exceed the actual CPU count | ||
result = min(result, CPU_COUNT) | ||
|
||
return result |
9 changes: 9 additions & 0 deletions
9
ix-dev/community/jellyfin/migrations/migration_helpers/dns_config.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
def migrate_dns_config(dns_config): | ||
if not dns_config: | ||
return [] | ||
|
||
dns_opts = [] | ||
for opt in dns_config.get("options", []): | ||
dns_opts.append(f"{opt['name']}:{opt['value']}") | ||
|
||
return dns_opts |
15 changes: 15 additions & 0 deletions
15
ix-dev/community/jellyfin/migrations/migration_helpers/kubernetes_secrets.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
def get_value_from_secret(secrets={}, secret_name="", key=""): | ||
if not secrets or not secret_name or not key: | ||
raise ValueError("Expected [secrets], [secret_name] and [key] to be set") | ||
for secret in secrets.items(): | ||
curr_secret_name = secret[0] | ||
curr_data = secret[1] | ||
|
||
if curr_secret_name.endswith(secret_name): | ||
if not curr_data.get(key, None): | ||
raise ValueError( | ||
f"Expected [{key}] to be set in secret [{curr_secret_name}]" | ||
) | ||
return curr_data[key] | ||
|
||
raise ValueError(f"Secret [{secret_name}] not found") |
49 changes: 49 additions & 0 deletions
49
ix-dev/community/jellyfin/migrations/migration_helpers/memory.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
import re | ||
import math | ||
import psutil | ||
|
||
TOTAL_MEM = psutil.virtual_memory().total | ||
|
||
SINGLE_SUFFIX_REGEX = re.compile(r"^[1-9][0-9]*([EPTGMK])$") | ||
DOUBLE_SUFFIX_REGEX = re.compile(r"^[1-9][0-9]*([EPTGMK])i$") | ||
BYTES_INTEGER_REGEX = re.compile(r"^[1-9][0-9]*$") | ||
EXPONENT_REGEX = re.compile(r"^[1-9][0-9]*e[0-9]+$") | ||
|
||
SUFFIX_MULTIPLIERS = { | ||
"K": 10**3, | ||
"M": 10**6, | ||
"G": 10**9, | ||
"T": 10**12, | ||
"P": 10**15, | ||
"E": 10**18, | ||
} | ||
|
||
DOUBLE_SUFFIX_MULTIPLIERS = { | ||
"Ki": 2**10, | ||
"Mi": 2**20, | ||
"Gi": 2**30, | ||
"Ti": 2**40, | ||
"Pi": 2**50, | ||
"Ei": 2**60, | ||
} | ||
|
||
|
||
def transform_memory(memory): | ||
result = 4096 # Default to 4GB | ||
|
||
if re.match(SINGLE_SUFFIX_REGEX, memory): | ||
suffix = memory[-1] | ||
result = int(memory[:-1]) * SUFFIX_MULTIPLIERS[suffix] | ||
elif re.match(DOUBLE_SUFFIX_REGEX, memory): | ||
suffix = memory[-2:] | ||
result = int(memory[:-2]) * DOUBLE_SUFFIX_MULTIPLIERS[suffix] | ||
elif re.match(BYTES_INTEGER_REGEX, memory): | ||
result = int(memory) | ||
elif re.match(EXPONENT_REGEX, memory): | ||
result = int(float(memory)) | ||
|
||
result = math.ceil(result) | ||
result = min(result, TOTAL_MEM) | ||
# Convert to Megabytes | ||
result = result / 1024 / 1024 | ||
return int(result) |
59 changes: 59 additions & 0 deletions
59
ix-dev/community/jellyfin/migrations/migration_helpers/resources.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
from .memory import transform_memory, TOTAL_MEM | ||
from .cpu import transform_cpu, CPU_COUNT | ||
|
||
|
||
def migrate_resources(resources, gpus=None, system_gpus=None): | ||
gpus = gpus or {} | ||
system_gpus = system_gpus or [] | ||
|
||
result = { | ||
"limits": { | ||
"cpus": (CPU_COUNT or 2) / 2, | ||
"memory": {TOTAL_MEM / 1024 / 1024}, | ||
} | ||
} | ||
|
||
if resources.get("limits", {}).get("cpu", ""): | ||
result["limits"].update( | ||
{"cpus": transform_cpu(resources.get("limits", {}).get("cpu", ""))} | ||
) | ||
if resources.get("limits", {}).get("memory", ""): | ||
result["limits"].update( | ||
{"memory": transform_memory(resources.get("limits", {}).get("memory", ""))} | ||
) | ||
|
||
gpus_result = {} | ||
for gpu in gpus.items() if gpus else []: | ||
kind = gpu[0].lower() # Kind of gpu (amd, nvidia, intel) | ||
count = gpu[1] # Number of gpus user requested | ||
|
||
if count == 0: | ||
continue | ||
|
||
if "amd" in kind or "intel" in kind: | ||
gpus_result.update({"use_all_gpus": True}) | ||
elif "nvidia" in kind: | ||
sys_gpus = [ | ||
gpu_item | ||
for gpu_item in system_gpus | ||
if gpu_item.get("error") is None | ||
and gpu_item.get("vendor", None) is not None | ||
and gpu_item.get("vendor", "").upper() == "NVIDIA" | ||
] | ||
for sys_gpu in sys_gpus: | ||
if count == 0: # We passed # of gpus that user previously requested | ||
break | ||
guid = sys_gpu.get("vendor_specific_config", {}).get("uuid", "") | ||
pci_slot = sys_gpu.get("pci_slot", "") | ||
if not guid or not pci_slot: | ||
continue | ||
|
||
gpus_result.update( | ||
{"nvidia_gpu_selection": {pci_slot: {"uuid": guid, "use_gpu": True}}} | ||
) | ||
count -= 1 | ||
|
||
if gpus_result: | ||
result.update({"gpus": gpus_result}) | ||
|
||
return result |
Oops, something went wrong.