diff --git a/charts/plex/1.1.0/charts/common-2101.0.0.tgz b/charts/plex/1.1.0/charts/common-2101.0.0.tgz deleted file mode 100644 index 3a22457ea6..0000000000 Binary files a/charts/plex/1.1.0/charts/common-2101.0.0.tgz and /dev/null differ diff --git a/charts/plex/1.1.0/.helmignore b/charts/plex/1.3.0/.helmignore similarity index 100% rename from charts/plex/1.1.0/.helmignore rename to charts/plex/1.3.0/.helmignore diff --git a/charts/plex/1.1.0/Chart.lock b/charts/plex/1.3.0/Chart.lock similarity index 100% rename from charts/plex/1.1.0/Chart.lock rename to charts/plex/1.3.0/Chart.lock diff --git a/charts/plex/1.1.0/Chart.yaml b/charts/plex/1.3.0/Chart.yaml similarity index 89% rename from charts/plex/1.1.0/Chart.yaml rename to charts/plex/1.3.0/Chart.yaml index 2d82d67bc3..72a065cde2 100644 --- a/charts/plex/1.1.0/Chart.yaml +++ b/charts/plex/1.3.0/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: 1.20.2.3402 +appVersion: 1.21.3.4046-3c1c83ba4 description: Plex Media Server name: plex -version: 1.1.0 +version: 1.3.0 keywords: - plex home: https://plex.tv/ diff --git a/charts/plex/1.1.0/README.md b/charts/plex/1.3.0/README.md similarity index 100% rename from charts/plex/1.1.0/README.md rename to charts/plex/1.3.0/README.md diff --git a/charts/plex/1.1.0/app-readme.md b/charts/plex/1.3.0/app-readme.md similarity index 100% rename from charts/plex/1.1.0/app-readme.md rename to charts/plex/1.3.0/app-readme.md diff --git a/charts/plex/1.3.0/charts/common-2101.0.0.tgz b/charts/plex/1.3.0/charts/common-2101.0.0.tgz new file mode 100644 index 0000000000..91e9592a56 Binary files /dev/null and b/charts/plex/1.3.0/charts/common-2101.0.0.tgz differ diff --git a/charts/plex/1.1.0/default_values.yaml b/charts/plex/1.3.0/default_values.yaml similarity index 100% rename from charts/plex/1.1.0/default_values.yaml rename to charts/plex/1.3.0/default_values.yaml diff --git a/charts/plex/1.3.0/ix_values.yaml b/charts/plex/1.3.0/ix_values.yaml new file mode 100644 index 0000000000..aa00419111 --- /dev/null +++ b/charts/plex/1.3.0/ix_values.yaml @@ -0,0 +1,4 @@ +image: + repository: plexinc/pms-docker + tag: 1.21.3.4046-3c1c83ba4 + pullPolicy: IfNotPresent diff --git a/charts/plex/1.1.0/migrations/migrate b/charts/plex/1.3.0/migrations/migrate_from_1.0.0 similarity index 100% rename from charts/plex/1.1.0/migrations/migrate rename to charts/plex/1.3.0/migrations/migrate_from_1.0.0 diff --git a/charts/plex/1.1.0/questions.yaml b/charts/plex/1.3.0/questions.yaml similarity index 88% rename from charts/plex/1.1.0/questions.yaml rename to charts/plex/1.3.0/questions.yaml index 540c330710..b29a5392c9 100644 --- a/charts/plex/1.1.0/questions.yaml +++ b/charts/plex/1.3.0/questions.yaml @@ -31,42 +31,6 @@ portals: path: "/web" questions: - # Image related - - variable: image - description: "Docker Image Details" - label: "Docker Image" - group: "Container Images" - schema: - type: dict - required: true - attrs: - - variable: repository - description: "Docker image repository" - label: "Image repository" - schema: - type: string - required: true - default: "plexinc/pms-docker" - - variable: tag - description: "Tag to use for specified image" - label: "Image Tag" - schema: - type: string - default: "1.20.2.3402-0fec14d92" - - variable: pullPolicy - description: "Docker Image Pull Policy" - label: "Image Pull Policy" - schema: - type: string - default: "IfNotPresent" - enum: - - value: "IfNotPresent" - description: "Only pull image if not present on host" - - value: "Always" - description: "Always pull image even if present on host" - - value: "Never" - description: "Never pull image even if it's not present on host" - - variable: claimToken label: "Plex Claim Token" group: "Plex Configuration" diff --git a/charts/plex/1.1.0/templates/NOTES.txt b/charts/plex/1.3.0/templates/NOTES.txt similarity index 100% rename from charts/plex/1.1.0/templates/NOTES.txt rename to charts/plex/1.3.0/templates/NOTES.txt diff --git a/charts/plex/1.1.0/templates/deployment.yaml b/charts/plex/1.3.0/templates/deployment.yaml similarity index 68% rename from charts/plex/1.1.0/templates/deployment.yaml rename to charts/plex/1.3.0/templates/deployment.yaml index 6f3283aa64..778a1db7ed 100644 --- a/charts/plex/1.1.0/templates/deployment.yaml +++ b/charts/plex/1.3.0/templates/deployment.yaml @@ -9,8 +9,12 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} containers: - name: {{ .Chart.Name }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} - {{ include "common.storage.allContainerVolumeMounts" .Values | nindent 10 }} {{ include "common.containers.gpuConfiguration" .Values | nindent 10 }} + volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} + - name: plex-probe-check + mountPath: /bin/plex_probe_check.sh + readOnly: true + subPath: entrypoint.sh ports: - name: pms protocol: TCP @@ -41,29 +45,40 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} valueFrom: fieldRef: fieldPath: metadata.namespace + - name: POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP {{ $envList := (default list .Values.environmentVariables) }} + {{ if and .Values.gpuConfiguration (hasKey .Values.gpuConfiguration "nvidia.com/gpu") (gt (get .Values.gpuConfiguration "nvidia.com/gpu" | toDecimal) 0) }} + {{ $envList = mustAppend $envList (dict "name" "NVIDIA_DRIVER_CAPABILITIES" "value" "all") }} + {{ end }} {{ $envList = mustAppend $envList (dict "name" "TZ" "value" .Values.timezone) }} {{ $envList = mustAppend $envList (dict "name" "PLEX_CLAIM" "value" .Values.claimToken) }} {{ $envList = mustAppend $envList (dict "name" "PMS_INTERNAL_ADDRESS" "value" (printf "http://%s:32400" (include "common.names.fullname" .))) }} {{ $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: - httpGet: - path: /identity - port: 32400 + exec: + command: + - /bin/plex_probe_check.sh failureThreshold: 5 periodSeconds: 15 livenessProbe: - httpGet: - path: /identity - port: 32400 + exec: + command: + - /bin/plex_probe_check.sh failureThreshold: 5 periodSeconds: 15 startupProbe: - httpGet: - path: /identity - port: 32400 + exec: + command: + - /bin/plex_probe_check.sh initialDelaySeconds: 5 failureThreshold: 40 periodSeconds: 15 -{{ include "common.storage.allAppVolumes" .Values | nindent 6 }} + volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }} + - name: plex-probe-check + configMap: + defaultMode: 0700 + name: "plex-probe-check" diff --git a/charts/plex/1.3.0/templates/probe_config.yaml b/charts/plex/1.3.0/templates/probe_config.yaml new file mode 100644 index 0000000000..736ee8cf47 --- /dev/null +++ b/charts/plex/1.3.0/templates/probe_config.yaml @@ -0,0 +1,8 @@ +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.1.0/templates/service-tcp.yaml b/charts/plex/1.3.0/templates/service-tcp.yaml similarity index 100% rename from charts/plex/1.1.0/templates/service-tcp.yaml rename to charts/plex/1.3.0/templates/service-tcp.yaml diff --git a/charts/plex/1.1.0/templates/service-udp.yaml b/charts/plex/1.3.0/templates/service-udp.yaml similarity index 100% rename from charts/plex/1.1.0/templates/service-udp.yaml rename to charts/plex/1.3.0/templates/service-udp.yaml diff --git a/charts/plex/1.1.0/test_values.yaml b/charts/plex/1.3.0/test_values.yaml similarity index 100% rename from charts/plex/1.1.0/test_values.yaml rename to charts/plex/1.3.0/test_values.yaml diff --git a/charts/plex/1.1.0/values.yaml b/charts/plex/1.3.0/values.yaml similarity index 100% rename from charts/plex/1.1.0/values.yaml rename to charts/plex/1.3.0/values.yaml