Merge pull request #277 from truenas/NAS-114011

NAS-114011 / 22.02 / Allow using plexpass for plex app

charts/plex/1.6.16/Chart.yaml

@@ -14,4 +14,4 @@ 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.6.15
+version: 1.6.16

charts/plex/1.6.16/ix_values.yaml

@@ -2,3 +2,7 @@ image:
   pullPolicy: IfNotPresent
   repository: plexinc/pms-docker
   tag: 1.25.2.5319-c43dc0277
+plexpassImage:
+  pullPolicy: IfNotPresent
+  repository: plexinc/pms-docker
+  tag: plexpass

charts/plex/1.6.16/questions.yaml

@@ -1,16 +1,10 @@
 groups:
-  - name: "Container Images"
-    description: "Image to be used for container"
-  - name: "Container Entrypoint"
-    description: "Configuration of the executable that will be run when the container is started"
-  - name: "Container Environment Variables"
-    description: "Set the environment that will be visible to the container"
+  - name: "Plex Configuration"
+    description: "Configure plex deployment"
   - name: "Networking"
     description: "Configure networking for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Plex Configuration"
-    description: "Configure plex deployment"
   - name: "Workload Details"
     description: "Configure how workload should be deployed"
   - name: "Scaling/Upgrade Policy"
@@ -33,7 +27,12 @@ portals:
     path: "/web"
 
 questions:
-
+  - variable: enablePlexPass
+    label: "Use PlexPass"
+    group: "Plex Configuration"
+    schema:
+      type: boolean
+      default: false
   - variable: dnsConfig
     label: "DNS Configuration"
     group: "Advanced DNS Settings"

charts/plex/1.6.16/templates/deployment.yaml

@@ -8,7 +8,11 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
     {{- end }}
       containers:
         - name: {{ .Chart.Name }}
-          {{ include "common.containers.imageConfig" .Values.image | nindent 10 }}
+          {{ if .Values.enablePlexPass }}
+            {{ include "common.containers.imageConfig" .Values.plexpassImage | nindent 10 }}
+          {{ else }}
+            {{ include "common.containers.imageConfig" .Values.image | nindent 10 }}
+          {{ end }}
           {{ include "common.containers.gpuConfiguration" .Values | nindent 10 }}
           volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }}
             - name: plex-probe-check

charts/plex/1.6.16/test_values.yaml

@@ -29,3 +29,4 @@ plexServiceTCP:
   port: 32400
 timezone: Etc/UTC
 updateStrategy: Recreate
+enablePlexPass: false

test/plex/1.6.16/Chart.yaml

@@ -14,4 +14,4 @@ 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.6.15
+version: 1.6.16

test/plex/1.6.16/ix_values.yaml

@@ -2,3 +2,7 @@ image:
   pullPolicy: IfNotPresent
   repository: plexinc/pms-docker
   tag: 1.25.2.5319-c43dc0277
+plexpassImage:
+  pullPolicy: IfNotPresent
+  repository: plexinc/pms-docker
+  tag: plexpass

test/plex/1.6.16/questions.yaml

@@ -1,16 +1,10 @@
 groups:
-  - name: "Container Images"
-    description: "Image to be used for container"
-  - name: "Container Entrypoint"
-    description: "Configuration of the executable that will be run when the container is started"
-  - name: "Container Environment Variables"
-    description: "Set the environment that will be visible to the container"
+  - name: "Plex Configuration"
+    description: "Configure plex deployment"
   - name: "Networking"
     description: "Configure networking for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Plex Configuration"
-    description: "Configure plex deployment"
   - name: "Workload Details"
     description: "Configure how workload should be deployed"
   - name: "Scaling/Upgrade Policy"
@@ -33,7 +27,12 @@ portals:
     path: "/web"
 
 questions:
-
+  - variable: enablePlexPass
+    label: "Use PlexPass"
+    group: "Plex Configuration"
+    schema:
+      type: boolean
+      default: false
   - variable: dnsConfig
     label: "DNS Configuration"
     group: "Advanced DNS Settings"

test/plex/1.6.16/templates/deployment.yaml

@@ -8,7 +8,11 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
     {{- end }}
       containers:
         - name: {{ .Chart.Name }}
-          {{ include "common.containers.imageConfig" .Values.image | nindent 10 }}
+          {{ if .Values.enablePlexPass }}
+            {{ include "common.containers.imageConfig" .Values.plexpassImage | nindent 10 }}
+          {{ else }}
+            {{ include "common.containers.imageConfig" .Values.image | nindent 10 }}
+          {{ end }}
           {{ include "common.containers.gpuConfiguration" .Values | nindent 10 }}
           volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }}
             - name: plex-probe-check

test/plex/1.6.16/test_values.yaml

@@ -29,3 +29,4 @@ plexServiceTCP:
   port: 32400
 timezone: Etc/UTC
 updateStrategy: Recreate
+enablePlexPass: false