Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
pabloromeo committed Aug 31, 2023
2 parents 4be5632 + 679f04a commit a5ac509
Show file tree
Hide file tree
Showing 9 changed files with 557 additions and 14 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ name: Release Charts

on:
push:
branches:
- master
tags:
- 'v*.*.*'
- 'chart-v*.*.*'

jobs:
release:
Expand Down Expand Up @@ -54,7 +53,7 @@ jobs:
shell: bash
working-directory: dest
run: |
helm repo index . --url https://pabloromeo.github.io/clusterplex
helm repo index --url https://pabloromeo.github.io/clusterplex --merge index.yaml .
- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/lscr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,19 @@ on:
- 'experimental'
tags:
- 'v*.*.*'
paths-ignore:
- 'charts/**'
pull_request:
branches:
- 'master'
- 'dev'
paths-ignore:
- 'charts/**'

permissions:
permissions:
contents: read
packages: write

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
build-pms-docker-mod:
Expand All @@ -29,7 +33,7 @@ jobs:
# Get the repositery's code
- name: Checkout
uses: actions/checkout@v3

# https://github.com/docker/setup-buildx-action
- name: Set up Docker Buildx
id: buildx
Expand Down Expand Up @@ -90,7 +94,7 @@ jobs:
# Get the repositery's code
- name: Checkout
uses: actions/checkout@v3

# https://github.com/docker/setup-buildx-action
- name: Set up Docker Buildx
id: buildx
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,14 @@ on:
- "experimental"
tags:
- "v*.*.*"
paths-ignore:
- 'charts/**'
pull_request:
branches:
- "master"
- "dev"
paths-ignore:
- 'charts/**'

permissions:
contents: read
Expand Down
2 changes: 1 addition & 1 deletion charts/clusterplex/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ sources:
- https://github.com/pabloromeo/clusterplex
- https://github.com/linuxserver/docker-plex
- https://plex.tv
version: 1.0.1
version: 1.1.0
appVersion: 1.4.5
6 changes: 4 additions & 2 deletions charts/clusterplex/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# clusterplex

![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.4](https://img.shields.io/badge/AppVersion-1.4.4-informational?style=flat-square)
![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.5](https://img.shields.io/badge/AppVersion-1.4.5-informational?style=flat-square)

ClusterPlex is basically an extended version of Plex, which supports distributed Workers across a cluster to handle transcoding requests.

Expand Down Expand Up @@ -67,11 +67,13 @@ $ helm install clusterplex clusterplex/clusterplex
| pms.env | string | `nil` | Additional environment variables. Template enabled. Syntax options: A) TZ: UTC B) PASSWD: '{{ .Release.Name }}' C) PASSWD: configMapKeyRef: name: config-map-name key: key-name D) PASSWD: valueFrom: secretKeyRef: name: secret-name key: key-name ... E) - name: TZ value: UTC F) - name: TZ value: '{{ .Release.Name }}' |
| pms.config | object | See below | Supply the configuration items used to configure the PMS component |
| pms.config.transcoderVerbose | int | `1` | Set this to 1 if you want only info logging from the transcoder or 0 if you want debugging logs |
| pms.config.transcodeOperatingMode | string | `"both"` | Set the transcode operating mode. Valid options are local (No workers), remote (only remote workers), both (default, remote first then local if remote fails). You MUST set this to local if you disable the worker installation. |
| pms.config.transcodeOperatingMode | string | `"both"` | Set the transcode operating mode. Valid options are local (No workers), remote (only remote workers), both (default, remote first then local if remote fails). If you disable the worker then this will be set to local automatically as that is the only valid option for that confguration. |
| pms.config.plexClaimToken | string | `nil` | Set the Plex claim token obtained from https://plex.tv/claim |
| pms.config.version | string | `"docker"` | Set the version of Plex to use. Valid options are docker, latest, public, or a specific version. [[ref](https://github.com/linuxserver/docker-plex#application-setup)] |
| pms.config.port | int | `32400` | The port that Plex will listen on |
| pms.config.localRelayEnabled | bool | `true` | Enable or disable the local relay function. In most cases this should be left to the default (true). If you disable this, you must add the pod IP address of each worker or the pod network CIDR to Plex under the `List of IP addresses and networks that are allowed without auth` option in Plex's network configuration. |
| pms.config.relayPort | int | `32499` | The port that the relay service will listen on |
| pms.config.pmsIP | string | `""` | The IP address that plex is using. This is only utilized if you disable the localRelayEnabled option above. |
| pms.serviceConfig | object | See below | Configure the kubernetes service associated with the the PMS component |
| pms.serviceConfig.externalTrafficPolicy | string | `nil` | Specify the externalTrafficPolicy for the service. Options: Cluster, Local [[ref](https://kubernetes.io/docs/tutorials/services/source-ip/)] |
| pms.serviceConfig.annotations | object | `{}` | Provide additional annotations which may be required. |
Expand Down
Loading

0 comments on commit a5ac509

Please sign in to comment.