From 4b2c70e4268fedac26a1e2cebe55045c460f74a1 Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Mon, 30 Jul 2018 23:00:06 +0100 Subject: [PATCH] Add option to disable scalable transcoding --- charts/kube-plex/templates/deployment.yaml | 8 ++++++++ charts/kube-plex/templates/rbac.yaml | 2 ++ charts/kube-plex/templates/volumes.yaml | 2 +- charts/kube-plex/values.yaml | 10 ++++++---- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/charts/kube-plex/templates/deployment.yaml b/charts/kube-plex/templates/deployment.yaml index 62e04b4..96bdd6c 100644 --- a/charts/kube-plex/templates/deployment.yaml +++ b/charts/kube-plex/templates/deployment.yaml @@ -23,6 +23,7 @@ spec: spec: serviceAccountName: {{ if .Values.rbac.create }}{{ template "fullname" . }}{{ else }}{{ .Values.rbac.serviceAccountName | quote }}{{ end }} hostname: "{{ template "fullname" . }}" +{{- if .Values.kubePlex.enabled }} initContainers: - name: kube-plex-install image: "{{ .Values.kubePlexImage.repository }}:{{ .Values.kubePlexImage.tag }}" @@ -34,10 +35,12 @@ spec: volumeMounts: - name: shared mountPath: /shared +{{- end }} containers: - name: plex image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} +{{- if .Values.kubePlex.enabled }} # We replace the PMS binary with a postStart hook to save having to # modify the default image entrypoint. lifecycle: @@ -51,6 +54,7 @@ spec: set -e rm -f '/usr/lib/plexmediaserver/Plex Transcoder' cp /shared/kube-plex '/usr/lib/plexmediaserver/Plex Transcoder' +{{- end }} # readinessProbe: # httpGet: # path: / @@ -119,11 +123,15 @@ spec: claimName: "{{ template "fullname" . }}-config" {{- end }} - name: transcode +{{- if .Values.persistence.transcode.enabled }} persistentVolumeClaim: {{- if .Values.persistence.transcode.claimName }} claimName: "{{ .Values.persistence.transcode.claimName }}" {{- else }} claimName: "{{ template "fullname" . }}-transcode" +{{- end }} +{{- else }} + emptyDir: {} {{- end }} - name: shared emptyDir: {} diff --git a/charts/kube-plex/templates/rbac.yaml b/charts/kube-plex/templates/rbac.yaml index ef7bc49..a327770 100644 --- a/charts/kube-plex/templates/rbac.yaml +++ b/charts/kube-plex/templates/rbac.yaml @@ -1,4 +1,5 @@ {{- if .Values.rbac.create -}} +{{- if .Values.kubePlex.enabled }} apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -44,6 +45,7 @@ subjects: - kind: ServiceAccount name: {{ template "fullname" . }} namespace: {{ .Release.Namespace | quote }} +{{- end }} --- apiVersion: v1 kind: ServiceAccount diff --git a/charts/kube-plex/templates/volumes.yaml b/charts/kube-plex/templates/volumes.yaml index cd5cade..0e25c28 100644 --- a/charts/kube-plex/templates/volumes.yaml +++ b/charts/kube-plex/templates/volumes.yaml @@ -1,4 +1,4 @@ -{{- if not .Values.persistence.transcode.claimName }} +{{- if and (not .Values.persistence.transcode.claimName) .Values.persistence.transcode.enabled }} apiVersion: v1 kind: PersistentVolumeClaim metadata: diff --git a/charts/kube-plex/values.yaml b/charts/kube-plex/values.yaml index 92c9096..f1fd742 100644 --- a/charts/kube-plex/values.yaml +++ b/charts/kube-plex/values.yaml @@ -6,10 +6,12 @@ image: tag: 1.10.1.4602-f54242b6b pullPolicy: IfNotPresent -kubePlexImage: - repository: quay.io/munnerz/kube-plex - tag: latest - pullPolicy: Always +kubePlex: + enabled: true + image: + repository: quay.io/munnerz/kube-plex + tag: latest + pullPolicy: Always # Override this with the plex claim token from plex.tv/claim claimToken: ""