Merge pull request #104 from tedder/patch-1

add a hint about type=loadbalancer

README.md

@@ -39,7 +39,7 @@ media, you can specify its name with `--set persistence.data.claimName`. If not
 specified, a persistent volume will be automatically provisioned for you.
 
 ```bash
-➜  helm install ./charts/kube-plex --name plex \
+➜  helm install plex ./charts/kube-plex \
     --namespace plex \
     --set claimToken=[insert claim token here] \
     --set persistence.data.claimName=existing-pms-data-pvc \

charts/kube-plex/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.16.0.1226-7eb2c8f6f
 description: Plex Media Server
 name: kube-plex
-version: 0.2.5
+version: 0.2.7
 keywords:
   - plex
 home: https://plex.tv/

charts/kube-plex/README.md

@@ -19,7 +19,7 @@ The following tables lists the configurable parameters of the Plex chart and the
 | `service.port`          | Kubernetes port where the plex GUI/API is exposed| `32400` |
 | `service.annotations`   | Service annotations for the Plex GUI | `{}` |
 | `service.labels`        | Custom labels | `{}` |
-| `service.loadBalancerIP` | Loadbalance IP for the Plex GUI | `{}` |
+| `service.loadBalancerIP` | Load balancer IP for the Plex GUI; set `service.type` to `LoadBalancer` to use this. | `{}` |
 | `service.loadBalancerSourceRanges` | List of IP CIDRs allowed access to load balancer (if supported)      | None
 | `ingress.enabled`              | Enables Ingress | `false` |
 | `ingress.annotations`          | Ingress annotations | `{}` |
@@ -34,19 +34,26 @@ The following tables lists the configurable parameters of the Plex chart and the
 | `persistence.transcode.claimName`| Use an existing PVC to persist data | `nil` |
 | `persistence.transcode.subPath` | SubPath to use for existing Claim | `nil` |
 | `persistence.transcode.storageClass` | Type of persistent volume claim | `-` |
+| `persistence.transcode.accessMode` | Persistent volume access mode | `ReadWriteMany` |
 | `persistence.data.size`         | Size of persistent volume claim | `40Gi` |
-| `persistence.data.existingClaim`| Use an existing PVC to persist data | `nil` |
+| `persistence.data.claimName`| Use an existing PVC to persist data | `nil` |
 | `persistence.data.subPath` | SubPath to use for existing Claim | `nil` |
 | `persistence.data.storageClass` | Type of persistent volume claim | `-` |
+| `persistence.data.accessMode` | Persistent volume access mode | `ReadWriteMany` |
+| `persistence.extraData` | Extra data mounts.  Should be an array of items matching persistence.data entries | `[]` |
 | `persistence.config.size`         | Size of persistent volume claim | `20Gi` |
-| `persistence.config.existingClaim`| Use an existing PVC to persist data | `nil` |
+| `persistence.config.claimName`| Use an existing PVC to persist data | `nil` |
 | `persistence.config.subPath` | SubPath to use for existing Claim | `nil` |
 | `persistence.config.storageClass` | Type of persistent volume claim | `-` |
+| `persistence.config.accessMode` | Persistent volume access mode | `ReadWriteMany` |
 | `resources`                | CPU/Memory resource requests/limits | `{}` |
-| `podAnnotations`           | Key-value pairs to add as pod annotations  | `{}` |
 | `proxy.enable`           | use to enable PMS proxy environmental variable  | `{false}` |
 | `proxy.http`           | HTTP_PROXY value 'http://proxy.lan:8080'  | `{}` |
 | `proxy.https`           | HTTPS_PROXY value 'http://proxy.lan:8080'  | `{}` |
 | `proxy.noproxy`           | NO_PROXY value 'localhost,127.0.0.1,10.96.0.0/12,10.244.0.0/12'  | `{}` |
+| `tolerations`           | Pod tolerations  | `[]` |
+| `affinity`           | Pod affinity configuration  | `{}` |
+| `podAnnotations`           | Key-value pairs to add as pod annotations  | `{}` |
+| `deploymentAnnotations`           | Key-value pairs to add as deployment annotations  | `{}` |
 
 Read through the [values.yaml](values.yaml) file. It has several commented out suggested values.

charts/kube-plex/templates/deployment.yaml

@@ -7,8 +7,15 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+  {{- if .Values.deploymentAnnotations }}
+  annotations:
+    {{- range $key, $value := .Values.deploymentAnnotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- end }}
 spec:
   replicas: 1
+  revisionHistoryLimit: 3
   strategy:
     type: Recreate
   selector:
@@ -143,6 +150,10 @@ spec:
         {{- if .Values.persistence.transcode.subPath }}
           subPath: {{ .Values.persistence.transcode.subPath }}
         {{ end }}
+        {{-  range .Values.persistence.extraData }}
+        - mountPath: "/data-{{ .name }}"
+          name: "extradata-{{ .name }}"
+        {{- end }}
         - name: shared
           mountPath: /shared
         resources:
@@ -176,6 +187,23 @@ spec:
 {{- end }}
 {{- else }}
         emptyDir: {}
+{{- end }}
+{{-  range .Values.persistence.extraData }}
+      - name: "extradata-{{ .name }}"
+        persistentVolumeClaim:
+{{- if .claimName }}
+          claimName: "{{ .claimName }}"
+{{- else }}
+          claimName: "extradata-{{ .name }}"
+{{- end }}
 {{- end }}
       - name: shared
         emptyDir: {}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}

charts/kube-plex/templates/volumes.yaml

@@ -11,7 +11,7 @@ metadata:
     component: transcode
 spec:
   accessModes:
-  - ReadWriteMany
+  - {{ .Values.persistence.config.accessMode | quote }}
   resources:
     requests:
       storage: {{ .Values.persistence.transcode.size | quote }}
@@ -55,7 +55,7 @@ metadata:
     component: data
 spec:
   accessModes:
-  - ReadWriteMany
+  - {{ .Values.persistence.data.accessMode | quote }}
   resources:
     requests:
       storage: {{ .Values.persistence.data.size | quote }}

charts/kube-plex/values.yaml

@@ -77,6 +77,8 @@ persistence:
     # The requested size of the volume to be used when creating a
     # PersistentVolumeClaim.
     size: 20Gi
+    # Access mode for this volume
+    accessMode: ReadWriteMany
   data:
     # Optionally specify claimName to manually override the PVC to be used for
     # the data directory. If claimName is specified, storageClass and size are
@@ -90,6 +92,15 @@ persistence:
     # The requested size of the volume to be used when creating a
     # PersistentVolumeClaim.
     size: 40Gi
+    # Access mode for this volume
+    accessMode: ReadWriteMany
+  extraData: []
+    # Optionally specifify additional Data mounts.  These will be mounted as
+    # /data-${name}.  This should be in the same format as the above 'data', 
+    # with the additional field 'name'
+    # - claimName: "special-tv"
+    #   name: 'foo'
+
   config:
     # Optionally specify claimName to manually override the PVC to be used for
     # the config directory. If claimName is specified, storageClass and size
@@ -103,6 +114,7 @@ persistence:
     # The requested size of the volume to be used when creating a
     # PersistentVolumeClaim.
     size: 20Gi
+    # Access mode for this volume
     accessMode: ReadWriteMany
 
 resources: {}
@@ -119,9 +131,18 @@ resources: {}
 
 podAnnotations: {}
 
+deploymentAnnotations: {}
+
 proxy: 
   # This allows to set a proxy environment variable, which PMS uses to fetch the token and assets like movie cover
   enable: 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"
+
+
+# allows setting which taints kubeplex tolerates
+tolerations: []
+
+# allows specifying node affinity
+affinity: {}