diff --git a/charts/plex/1.7.32/Chart.lock b/charts/plex/1.7.32/Chart.lock deleted file mode 100644 index ed178dfc29..0000000000 --- a/charts/plex/1.7.32/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2207.0.0 - version: 2207.0.0 -digest: sha256:f17f3d458ca0210a52e39da0dce35034e900b36f2040d4b19bed46a7aae91506 -generated: "2022-07-25T00:20:48.105219554+05:00" diff --git a/charts/plex/1.7.32/Chart.yaml b/charts/plex/1.7.32/Chart.yaml deleted file mode 100644 index b70dca3262..0000000000 --- a/charts/plex/1.7.32/Chart.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v2 -appVersion: 1.31.2.6810 -dependencies: -- name: common - repository: file://../../../library/common/2207.0.0 - version: 2207.0.0 -description: Plex Media Server -home: https://plex.tv/ -icon: https://www.plex.tv/wp-content/uploads/2018/01/pmp-icon-1.png -keywords: -- plex -name: plex -sources: -- https://hub.docker.com/r/plexinc/pms-docker/ -- https://github.com/k8s-at-home/charts/tree/master/charts/plex -upstream_version: 2.1.0 -version: 1.7.32 diff --git a/charts/plex/1.7.32/charts/common-2207.0.0.tgz b/charts/plex/1.7.32/charts/common-2207.0.0.tgz deleted file mode 100644 index 2adf94b438..0000000000 Binary files a/charts/plex/1.7.32/charts/common-2207.0.0.tgz and /dev/null differ diff --git a/charts/plex/1.7.32/default_values.yaml b/charts/plex/1.7.32/default_values.yaml deleted file mode 100644 index 12b8b12cc6..0000000000 --- a/charts/plex/1.7.32/default_values.yaml +++ /dev/null @@ -1,84 +0,0 @@ -# Default values -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -# The Image to use for PLEX - -image: - repository: plexinc/pms-docker - tag: 1.20.2.3402-0fec14d92 - pullPolicy: IfNotPresent - -##### START --> Official PLEX container environment variables -# Override this with the plex claim token from plex.tv/claim -claimToken: "" - -# Set the timezone of the plex server -timezone: "Etc/UTC" - -# add your pod network subnet to the `List of IP addresses and networks that are allowed without auth` -# This will override the manual settings, so only use this if you will not need to change it manually. -# This list will be automatically converted to a command seperated string when passed to the container. -# You would specify this when using helm CLI with --set allowedNetworks="{127.0.0.1,10.54.2.0/24}" -# allowedNetworks: -# - 127.0.0.1 -# - 10.54.2.0/24 - -# Instruct the Plex Media Server Container to Change the Configuration Directory Ownership -# Default is true, you would only need to set this if you want to disable it. -# changeConfigDirOwnership: true - -# advertiseIp This variable defines the additional IPs on which the server may be be found. -# For example: http://10.1.1.23:32400. -# This adds to the list where the server advertises that it can be found. -# See https://hub.docker.com/r/plexinc/pms-docker/ for details -# advertiseIp: "http://10.1.1.23:32400" - -# Set The user id of the plex user created inside the container. -# See https://hub.docker.com/r/plexinc/pms-docker/ for details -# plexUid: 1000 - -# Set The group id of the plex group created inside the container -# See https://hub.docker.com/r/plexinc/pms-docker/ for details -# plexGid: 1000 - -##### END --> Official PLEX container environment variables - -# You can add as many Additional ENV variables here -# The following is the same as --set extraEnv.TMPDIR="/transcode" -# extraEnv: -# TMPDIR: /transcode - -# upgrade strategy type (e.g. Recreate or RollingUpdate) -updateStrategy: Recreate - -plexServiceTCP: - port: 32400 - -hostNetwork: false - -proxy: - # This allows to set a proxy environment variable, which PMS uses to fetch the token and assets like movie cover - enabled: false - # http: "http://proxy:8080" - # https: "https://proxy:8080" - # noproxy: "localhost,127.0.0.1,10.96.0.0/12,10.244.0.0/12" - -gpuConfiguration: {} - -appVolumeMounts: - transcode: - emptyDir: true - mountPath: "/transcode" - data: - emptyDir: true - mountPath: "/data" - config: - emptyDir: true - mountPath: "/config" - shared: - emptyDir: true - mountPath: "shared" - shared-logs: - emptyDir: true - mountPath: "/config/Library/Application Support/Plex Media Server/Logs" diff --git a/charts/plex/1.7.32/templates/probe_config.yaml b/charts/plex/1.7.32/templates/probe_config.yaml deleted file mode 100644 index 736ee8cf47..0000000000 --- a/charts/plex/1.7.32/templates/probe_config.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "plex-probe-check" -data: - entrypoint.sh: |- - #!/bin/sh - curl -ksf http://$POD_IP:32400/identity -o /dev/null || curl -ksf https://$POD_IP:32400/identity -o /dev/null diff --git a/charts/plex/1.7.32/templates/tests/deployment-check.yaml b/charts/plex/1.7.32/templates/tests/deployment-check.yaml deleted file mode 100644 index 8e223fe348..0000000000 --- a/charts/plex/1.7.32/templates/tests/deployment-check.yaml +++ /dev/null @@ -1,21 +0,0 @@ -{{- $serviceName := (include "common.names.fullname" .) -}} -apiVersion: v1 -kind: Pod -metadata: - name: "{{ .Release.Name }}-plex-test" - labels: - app: {{ .Release.Name }} - release: {{ .Release.Name }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: test-curl - image: alpine/curl - imagePullPolicy: "IfNotPresent" - command: - - /bin/sh - - -ec - - | - curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ksf http://{{ $serviceName }}-tcp:32400/identity - restartPolicy: Never diff --git a/charts/plex/1.7.32/.helmignore b/library/ix-dev/charts/plex/.helmignore similarity index 100% rename from charts/plex/1.7.32/.helmignore rename to library/ix-dev/charts/plex/.helmignore diff --git a/library/ix-dev/charts/plex/Chart.lock b/library/ix-dev/charts/plex/Chart.lock new file mode 100644 index 0000000000..ec220cc934 --- /dev/null +++ b/library/ix-dev/charts/plex/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../common/2207.0.0 + version: 2207.0.0 +digest: sha256:a301ba0f99ec1e08a60a7f0a0320aa02d225993572f2f056f09520f06df88b37 +generated: "2023-03-21T16:48:15.265115312+02:00" diff --git a/library/ix-dev/charts/plex/Chart.yaml b/library/ix-dev/charts/plex/Chart.yaml new file mode 100644 index 0000000000..204d09d8f3 --- /dev/null +++ b/library/ix-dev/charts/plex/Chart.yaml @@ -0,0 +1,23 @@ +name: plex +description: Plex Media Server +annotations: + title: Plex +type: application +version: 1.7.33 +apiVersion: v2 +appVersion: '1.31.2.6810' +kubeVersion: '>=1.16.0-0' +maintainers: + - name: truenas + url: https://www.truenas.com/ +dependencies: + - name: common + repository: file://../../../common/2207.0.0 + version: 2207.0.0 +home: https://plex.tv/ +icon: https://www.plex.tv/wp-content/uploads/2018/01/pmp-icon-1.png +sources: + - https://hub.docker.com/r/plexinc/pms-docker/ + - https://github.com/k8s-at-home/charts/tree/master/charts/plex +keywords: + - plex diff --git a/charts/plex/1.7.32/README.md b/library/ix-dev/charts/plex/README.md similarity index 100% rename from charts/plex/1.7.32/README.md rename to library/ix-dev/charts/plex/README.md diff --git a/charts/plex/1.7.32/app-readme.md b/library/ix-dev/charts/plex/app-readme.md similarity index 100% rename from charts/plex/1.7.32/app-readme.md rename to library/ix-dev/charts/plex/app-readme.md diff --git a/library/ix-dev/charts/plex/charts/common-2207.0.0.tgz b/library/ix-dev/charts/plex/charts/common-2207.0.0.tgz new file mode 100644 index 0000000000..a29ec5c284 Binary files /dev/null and b/library/ix-dev/charts/plex/charts/common-2207.0.0.tgz differ diff --git a/charts/plex/1.7.32/test_values.yaml b/library/ix-dev/charts/plex/ci/test-values.yaml similarity index 87% rename from charts/plex/1.7.32/test_values.yaml rename to library/ix-dev/charts/plex/ci/test-values.yaml index a5c06ad9b1..3c187a8728 100644 --- a/charts/plex/1.7.32/test_values.yaml +++ b/library/ix-dev/charts/plex/ci/test-values.yaml @@ -26,10 +26,6 @@ extraAppVolumeMounts: readOnly: true gpuConfiguration: {} hostNetwork: false -image: - pullPolicy: IfNotPresent - repository: plexinc/pms-docker - tag: 1.31.2.6810-a607d384f plexServiceTCP: port: 32400 timezone: Etc/UTC diff --git a/charts/plex/item.yaml b/library/ix-dev/charts/plex/item.yaml similarity index 100% rename from charts/plex/item.yaml rename to library/ix-dev/charts/plex/item.yaml diff --git a/charts/plex/1.7.32/migrations/migrate_from_1.0.0 b/library/ix-dev/charts/plex/migrations/migrate_from_1.0.0 similarity index 100% rename from charts/plex/1.7.32/migrations/migrate_from_1.0.0 rename to library/ix-dev/charts/plex/migrations/migrate_from_1.0.0 diff --git a/charts/plex/1.7.32/questions.yaml b/library/ix-dev/charts/plex/questions.yaml similarity index 100% rename from charts/plex/1.7.32/questions.yaml rename to library/ix-dev/charts/plex/questions.yaml diff --git a/charts/plex/1.7.32/templates/NOTES.txt b/library/ix-dev/charts/plex/templates/NOTES.txt similarity index 100% rename from charts/plex/1.7.32/templates/NOTES.txt rename to library/ix-dev/charts/plex/templates/NOTES.txt diff --git a/charts/plex/1.7.32/templates/deployment.yaml b/library/ix-dev/charts/plex/templates/deployment.yaml similarity index 84% rename from charts/plex/1.7.32/templates/deployment.yaml rename to library/ix-dev/charts/plex/templates/deployment.yaml index 49044bf38d..164858ba0e 100644 --- a/charts/plex/1.7.32/templates/deployment.yaml +++ b/library/ix-dev/charts/plex/templates/deployment.yaml @@ -17,10 +17,6 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} {{ end }} volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} - - name: plex-probe-check - mountPath: /bin/plex_probe_check.sh - readOnly: true - subPath: entrypoint.sh {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} - name: extrappvolume-{{ $index }} mountPath: {{ $hostPathConfiguration.mountPath }} @@ -72,30 +68,34 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} {{ $envList = mustAppend $envList (dict "name" "PMS_IMAGE" "value" (printf "%s:%s" .Values.image.repository .Values.image.tag))}} {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 12 }} readinessProbe: - exec: - command: - - /bin/plex_probe_check.sh + httpGet: + path: /identity + port: 32400 + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 failureThreshold: 5 - periodSeconds: 15 + successThreshold: 2 livenessProbe: - exec: - command: - - /bin/plex_probe_check.sh + httpGet: + path: /identity + port: 32400 + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 failureThreshold: 5 - periodSeconds: 15 + successThreshold: 1 startupProbe: - exec: - command: - - /bin/plex_probe_check.sh - initialDelaySeconds: 5 - failureThreshold: 20 - periodSeconds: 15 + httpGet: + path: /identity + port: 32400 + initialDelaySeconds: 10 + periodSeconds: 5 + timeoutSeconds: 2 + failureThreshold: 60 + successThreshold: 1 {{ include "common.networking.dnsConfiguration" .Values | nindent 6 }} volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }} - - name: plex-probe-check - configMap: - defaultMode: 0700 - name: "plex-probe-check" {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} - name: extrappvolume-{{ $index }} hostPath: diff --git a/charts/plex/1.7.32/templates/service-tcp.yaml b/library/ix-dev/charts/plex/templates/service-tcp.yaml similarity index 100% rename from charts/plex/1.7.32/templates/service-tcp.yaml rename to library/ix-dev/charts/plex/templates/service-tcp.yaml diff --git a/charts/plex/1.7.32/templates/service-udp.yaml b/library/ix-dev/charts/plex/templates/service-udp.yaml similarity index 100% rename from charts/plex/1.7.32/templates/service-udp.yaml rename to library/ix-dev/charts/plex/templates/service-udp.yaml diff --git a/charts/plex/upgrade_info.json b/library/ix-dev/charts/plex/upgrade_info.json similarity index 100% rename from charts/plex/upgrade_info.json rename to library/ix-dev/charts/plex/upgrade_info.json diff --git a/charts/plex/upgrade_strategy b/library/ix-dev/charts/plex/upgrade_strategy similarity index 100% rename from charts/plex/upgrade_strategy rename to library/ix-dev/charts/plex/upgrade_strategy diff --git a/charts/plex/1.7.32/ix_values.yaml b/library/ix-dev/charts/plex/values.yaml similarity index 100% rename from charts/plex/1.7.32/ix_values.yaml rename to library/ix-dev/charts/plex/values.yaml